diff options
| author | Chris Lumens <clumens@redhat.com> | 2006-11-01 21:39:41 +0000 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2006-11-01 21:39:41 +0000 |
| commit | ba16fdee7cf59c85f7037d92adaebd3e49577378 (patch) | |
| tree | 1fea88a099ce3a2124626b8b749c335ad5c759ea /autopart.py | |
| parent | 63a879f9e6f57835ac7b8d1f07278b5c6a216e4b (diff) | |
| download | anaconda-ba16fdee7cf59c85f7037d92adaebd3e49577378.tar.gz anaconda-ba16fdee7cf59c85f7037d92adaebd3e49577378.tar.xz anaconda-ba16fdee7cf59c85f7037d92adaebd3e49577378.zip | |
Don't try to clear drives that are in the skippedList either.
Diffstat (limited to 'autopart.py')
| -rw-r--r-- | autopart.py | 6 |
1 files changed, 4 insertions, 2 deletions
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] |