Make sure that LUKS.has_key always returns a boolean value

We don't want to return 'None' here. Related: rhinstaller/anaconda#4873
storaged-project · Jul 12, 2023 · 86a2848 · 86a2848
1 parent 60ac8a4
commit 86a2848
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/blivet/devices/stratis.py b/blivet/devices/stratis.py
@@ -129,8 +129,8 @@ def _set_passphrase(self, passphrase):
 
     @property
     def has_key(self):
-        return ((self.__passphrase not in ["", None]) or
-                (self._key_file and os.access(self._key_file, os.R_OK)))
+        return bool((self.__passphrase not in ["", None]) or
+                    (self._key_file and os.access(self._key_file, os.R_OK)))
 
     def _pre_create(self):
         super(StratisPoolDevice, self)._pre_create()

diff --git a/blivet/formats/luks.py b/blivet/formats/luks.py
@@ -212,8 +212,8 @@ def _set_passphrase(self, passphrase):
 
     @property
     def has_key(self):
-        return ((self.__passphrase not in ["", None]) or
-                (self._key_file and os.access(self._key_file, os.R_OK)))
+        return bool((self.__passphrase not in ["", None]) or
+                    (self._key_file and os.access(self._key_file, os.R_OK)))
 
     @property
     def formattable(self):

diff --git a/blivet/formats/stratis.py b/blivet/formats/stratis.py
@@ -112,8 +112,8 @@ def _set_passphrase(self, passphrase):
 
     @property
     def has_key(self):
-        return ((self.__passphrase not in ["", None]) or
-                (self._key_file and os.access(self._key_file, os.R_OK)))
+        return bool((self.__passphrase not in ["", None]) or
+                    (self._key_file and os.access(self._key_file, os.R_OK)))
 
     def unlock_pool(self):
         if not self.locked_pool: