[master 1/1] Do not catch CryptoError when decrypting LUKS format (#1280239)

vojtechtrefny installerbot-noreply at redhat.com
Fri Nov 13 09:38:07 UTC 2015


From: Vojtech Trefny <vtrefny at redhat.com>

LUKS format.setup now raises LUKSError not blockdev.CryptoError
---
 blivet/populator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blivet/populator.py b/blivet/populator.py
index a1ed434..53dd045 100644
--- a/blivet/populator.py
+++ b/blivet/populator.py
@@ -846,7 +846,7 @@ def handle_udev_luks_format(self, info, device):
                     device.format.passphrase = passphrase
                     try:
                         device.format.setup()
-                    except blockdev.BlockDevError:
+                    except LUKSError:
                         device.format.passphrase = None
                     else:
                         break


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/ff72187c6494a24d1bf3e2b2d7e9c7c4f9b3230c


More information about the anaconda-patches mailing list