----- Original Message -----
From: "David Lehman" <dlehman(a)redhat.com>
To: anaconda-patches(a)lists.fedorahosted.org
Sent: Friday, December 13, 2013 10:55:32 AM
Subject: [PATCH 4/6] Remove a whole bunch of unused stuff from Blivet.
---
blivet/__init__.py | 188
+----------------------------------------------------
1 file changed, 2 insertions(+), 186 deletions(-)
diff --git a/blivet/__init__.py b/blivet/__init__.py
index 496a6ae..bad64ec 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -145,7 +145,8 @@ def storageInitialize(storage, ksdata, protected):
storage.reset()
- if protected and not flags.live_install and not
storage.protectedDevices:
+ if protected and not flags.live_install and \
+ not any(d.protected for d in storage.devices):
raise UnknownSourceDeviceError(protected)
This looks like a semantic change, on which I'm punting.
- @property
- def protectedDevices(self):
- devices = self.devicetree.devices
- protected = [d for d in devices if d.protected]
- protected.sort(key=lambda d: d.name)
- return protected
This can only go away because of the previous change I punted on, so I punt here as well.
- def doEncryptionPassphraseRetrofits(self):
- """ Add the global passphrase to all preexisting LUKS devices.
-
- This establishes a common passphrase for all encrypted devices
- in the system so that users only have to enter one passphrase
- during system boot.
- """
- if not self.encryptionRetrofit:
- return
-
- for device in self.devices:
- if device.format.type == "luks" and \
- device.format._LUKS__passphrase != self.encryptionPassphrase:
- log.info("adding new passphrase to preexisting encrypted "
- "device %s" % device.path)
- try:
- device.format.addPassphrase(self.encryptionPassphrase)
- except CryptoError:
- log.error("failed to add new passphrase to existing "
- "device %s" % device.path)
-
This seems to be still used by doIt @ line 311.
All others look fine to me.
- mulhern
--
1.8.1.4
_______________________________________________
anaconda-patches mailing list
anaconda-patches(a)lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches