Hi,
On 10/07/2009 03:31 PM, Chris Lumens wrote:
---
storage/__init__.py | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/storage/__init__.py b/storage/__init__.py
index 0f71d3c..54fec41 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -171,6 +171,12 @@ def storageComplete(anaconda):
return DISPATCH_BACK
def writeEscrowPackets(anaconda):
+ escrowDevices = map(lambda d: d.format.type == "luks" and not d.format.escrow_cert,
+ anaconda.id.storage.devices)
+
I believe that the not in "and not d.format.escrow_cert" should not be there.
Regards,
Hans
+ if not escrowDevices:
+ return
+
log.debug("escrow: writeEscrowPackets start")
wait_win = anaconda.intf.waitWindow(_("Running..."),
@@ -180,13 +186,11 @@ def writeEscrowPackets(anaconda):
backupPassphrase = generateBackupPassphrase()
try:
- for device in anaconda.id.storage.devices:
+ for device in escrowDevices:
log.debug("escrow: device %s: %s" %
(repr(device.path), repr(device.format.type)))
- if (device.format.type == "luks" and
- device.format.escrow_cert is not None):
- device.format.escrow(anaconda.rootPath + "/root",
- backupPassphrase)
+ device.format.escrow(anaconda.rootPath + "/root",
+ backupPassphrase)
wait_win.pop()
except (IOError, RuntimeError) as e:
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
