diff options
| author | Chris Lumens <clumens@redhat.com> | 2009-12-18 16:37:51 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2010-02-04 14:07:30 -0500 |
| commit | 479defc726e4c1ae665258e7fc80e4ff159698ee (patch) | |
| tree | 5a4b196b150c73e5c2dcf3965e63676713de4b86 /kickstart.py | |
| parent | 39a52ed1ddb2c4db05045955ccf9ba6066637807 (diff) | |
| download | anaconda-479defc726e4c1ae665258e7fc80e4ff159698ee.tar.gz anaconda-479defc726e4c1ae665258e7fc80e4ff159698ee.tar.xz anaconda-479defc726e4c1ae665258e7fc80e4ff159698ee.zip | |
Move upgrade-related data to the Anaconda object.
This also removes the hack where upgrade can be True, False, or None in order
to test whether we've seen the upgrade screen or not. Instead, it introduces
a global value hack. I consider this the slightly cleaner approach.
Diffstat (limited to 'kickstart.py')
| -rw-r--r-- | kickstart.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kickstart.py b/kickstart.py index f16773e1c..c93581af6 100644 --- a/kickstart.py +++ b/kickstart.py @@ -214,7 +214,7 @@ class Bootloader(commands.bootloader.F12_Bootloader): else: location = self.location - if self.upgrade and not anaconda.id.getUpgrade(): + if self.upgrade and not anaconda.upgrade: raise KickstartValueError, formatErrorMsg(self.lineno, msg="Selected upgrade mode for bootloader but not doing an upgrade") if self.upgrade: @@ -937,7 +937,7 @@ class Timezone(commands.timezone.FC6_Timezone): class Upgrade(commands.upgrade.F11_Upgrade): def execute(self, anaconda): - anaconda.id.setUpgrade(self.upgrade) + anaconda.upgrade = True class VolGroupData(commands.volgroup.FC3_VolGroupData): def execute(self, anaconda): |