On Wed, 2010-12-01 at 10:42 -0800, Brian C. Lane wrote: > On Tue, Nov 30, 2010 at 02:09:08PM -0600, David Lehman wrote: > > --- > > pyanaconda/iw/autopart_type.py | 36 ++++++------ > > pyanaconda/iw/cleardisks_gui.py | 10 ++-- > > pyanaconda/iw/examine_gui.py | 8 +- > > pyanaconda/iw/partition_gui.py | 10 ++-- > > pyanaconda/kickstart.py | 16 +++--- > > pyanaconda/storage/__init__.py | 112 ++++++++++++++++++------------------ > > pyanaconda/storage/devicetree.py | 19 +++--- > > pyanaconda/storage/partitioning.py | 21 ++++--- > > pyanaconda/textw/partition_text.py | 10 ++-- > > 9 files changed, 121 insertions(+), 121 deletions(-) > > > > > > @@ -290,11 +290,11 @@ class PartitionTypeWindow(InstallWindow): > > if self.storage.clearPartChoice: > > self.buttonGroup.setCurrent(self.storage.clearPartChoice) > > else: > > - if self.storage.clearPartType is None or self.storage.clearPartType == CLEARPART_TYPE_LINUX: > > + if self.storage.config.clearPartType not in (None, CLEARPART_TYPE_LINUX): > > self.buttonGroup.setCurrent("replace") > > This should be 'in' without 'not', otherwise it's never going to do the > right thing :) > > > @@ -351,7 +351,7 @@ def clearPartitions(storage): > > - Needs some error handling, especially for the parted bits. > > > > """ > > - if storage.clearPartType is None or storage.clearPartType == CLEARPART_TYPE_NONE: > > + if storage.config.clearPartType is None or storage.config.clearPartType == CLEARPART_TYPE_NONE: > > # not much to do > > return > > May as well do the same kind of thing here: > > if storage.config.clearPartType in (None, CLEARPART_TYPE_NONE): Good catch -- thanks. Both fixed in a set of cleanup patches I'm working on. Dave > > _______________________________________________ > Anaconda-devel-list mailing list > Anaconda-devel-list@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/anaconda-devel-list _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list