diff options
| author | Jeremy Katz <katzj@redhat.com> | 2004-09-24 21:19:44 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2004-09-24 21:19:44 +0000 |
| commit | 11535e328a1a29048e1c9e39ca03be357c88a455 (patch) | |
| tree | 929a8bd5cd9867b350f37b138c3e3dc6806ac84d | |
| parent | 66cfd9603aafd74647f441212cdfcf2fead9ddca (diff) | |
| download | anaconda-11535e328a1a29048e1c9e39ca03be357c88a455.tar.gz anaconda-11535e328a1a29048e1c9e39ca03be357c88a455.tar.xz anaconda-11535e328a1a29048e1c9e39ca03be357c88a455.zip | |
2004-09-24 Jeremy Katz <katzj@redhat.com>
* iw/partition_gui.py (PartitionWindow.populate):
* textw/partition_text.py (PartitionWindow.populate):
Free space isn't active, so we can't just ignore it. Instead,
just ignore non-active partitions of < 1 MB (#133425)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | iw/partition_gui.py | 10 | ||||
| -rw-r--r-- | textw/partition_text.py | 10 |
3 files changed, 13 insertions, 12 deletions
@@ -1,5 +1,10 @@ 2004-09-24 Jeremy Katz <katzj@redhat.com> + * iw/partition_gui.py (PartitionWindow.populate): + * textw/partition_text.py (PartitionWindow.populate): + Free space isn't active, so we can't just ignore it. Instead, + just ignore non-active partitions of < 1 MB (#133425) + * installclasses/rhel_as.py: * installclasses/rhel_desktop.py: * installclasses/rhel_es.py: diff --git a/iw/partition_gui.py b/iw/partition_gui.py index 02d5b6a29..bfc127088 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -809,13 +809,11 @@ class PartitionWindow(InstallWindow): if part.type & parted.PARTITION_METADATA: part = disk.next_partition(part) continue - if not part.is_active(): - part = disk.next_partition(part) - continue # ignore the tiny < 1 MB partitions (#119479) - if getPartSizeMB(part) <= 1.0 and not part.get_flag(parted.PARTITION_BOOT): - part = disk.next_partition(part) - continue + if getPartSizeMB(part) <= 1.0: + if not part.is_active() or not part.get_flag(parted.PARTITION_BOOT): + part = disk.next_partition(part) + continue stripe.add(part) device = get_partition_name(part) diff --git a/textw/partition_text.py b/textw/partition_text.py index c66106feb..25052c5d0 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -121,13 +121,11 @@ class PartitionWindow: # print "partition %s has type %d" %(get_partition_name(part), part.type) part = disk.next_partition(part) continue - if not part.is_active(): - part = disk.next_partition(part) - continue # ignore the tiny < 1 MB partitions (#119479) - if getPartSizeMB(part) <= 1.0 and not part.get_flag(parted.PARTITION_BOOT): - part = disk.next_partition(part) - continue + if getPartSizeMB(part) <= 1.0: + if not part.is_active() or not part.get_flag(parted.PARTITION_BOOT): + part = disk.next_partition(part) + continue device = get_partition_name(part) request = self.partitions.getRequestByDeviceName(device) |