Merge pull request #1428 from rvykydal/update-luks-passphrase-saving

Fix luks save_passphrase for missing format context

Author: vojtechtrefny

blivet/static_data/luks_data.py

@@ -86,7 +86,7 @@ def add_passphrases(self, passphrases):
     def save_passphrase(self, device):
         """ Save a device's LUKS passphrase in case of reset. """
         pctx = device.format.contexts.get_context("passphrase")
-        passphrase = pctx._passphrase
+        passphrase = pctx and pctx._passphrase
         if passphrase:
             luks_data.luks_devs[device.format.uuid] = passphrase
             self.add_passphrase(passphrase)

tests/storage_tests/formats_test/luks_test.py

@@ -304,6 +304,10 @@ def test_luks_save_passphrase(self):
         self.assertIsNotNone(disk)
         self.assertTrue(disk.format.has_key)
 
+        # remove passphrase and try to save it (should not fail)
+        disk.format.passphrase = None
+        blivet.static_data.luks_data.save_passphrase(disk)
+
     def test_label_subsystem(self):
         disk = self.storage.devicetree.get_device_by_path(self.vdevs[0])
         self.assertIsNotNone(disk)