From ba16fdee7cf59c85f7037d92adaebd3e49577378 Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Wed, 1 Nov 2006 21:39:41 +0000 Subject: Don't try to clear drives that are in the skippedList either. --- ChangeLog | 5 +++++ autopart.py | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02ad27a59..c3c458b12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,11 @@ set an active value on the peCombo, and don't traceback if the default value is the first one in the list (#212317). + * autopart.py (doClearPartAction): Don't try to clear drives that are + in the skippedList either. + + * yuminstall.py (YumBackend.mirrorFailureCB): Fix typo. + 2006-10-01 Paul Nasrat * backend.py (AnacondaBackend.getDefaultGroups): Signature change to diff --git a/autopart.py b/autopart.py index e5eb4c15a..970974e4e 100644 --- a/autopart.py +++ b/autopart.py @@ -1081,7 +1081,8 @@ def doClearPartAction(anaconda, partitions, diskset): for drive in drives: # skip drives not in clear drive list - if cleardrives and len(cleardrives) > 0 and not drive in cleardrives: + if (cleardrives and len(cleardrives) > 0 and not drive in cleardrives) or \ + drive in diskset.skippedDisks: continue disk = diskset.disks[drive] part = disk.next_partition() @@ -1167,7 +1168,8 @@ def doClearPartAction(anaconda, partitions, diskset): # set the diskset up doPartitioning(diskset, partitions, doRefresh = 1) for drive in drives: - if cleardrives and len(cleardrives) > 0 and not drive in cleardrives: + if (cleardrives and len(cleardrives) > 0 and not drive in cleardrives) or \ + drive in diskset.skippedDisks: continue disk = diskset.disks[drive] -- cgit