diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | anaconda.spec | 11 | ||||
| -rw-r--r-- | iw/examine_gui.py | 13 | ||||
| -rw-r--r-- | kickstart.py | 5 | ||||
| -rw-r--r-- | textw/upgrade_text.py | 7 | ||||
| -rw-r--r-- | upgrade.py | 41 | ||||
| -rw-r--r-- | upgradeclass.py | 75 |
7 files changed, 70 insertions, 94 deletions
@@ -1,3 +1,15 @@ +2007-01-19 Chris Lumens <clumens@redhat.com> + + * anaconda.spec: Bump version. + + * kickstart.py (setSteps): Upgrade is no longer an installclass, so + call upgrade.setSteps instead. + * upgrade.py (setSteps): Moved here from upgradeclass.py. + * upgradeclass.py: Removed. + * iw/examine_gui.py (UpgradeExamineWindow.getNext): Don't need to + instantiate an installclass anymore. + * textw/upgrade_text.py (UpgradeExamineWindow.__call__): Likewise. + 2007-01-19 Jeremy Katz <katzj@redhat.com> * ui/anaconda.glade: Revert my changes from yesterday since they diff --git a/anaconda.spec b/anaconda.spec index c3a8d40d0..475887f92 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.2.0.12 +Version: 11.2.0.13 Release: 1 License: GPL Summary: Graphical system installer @@ -103,6 +103,15 @@ rm -rf $RPM_BUILD_ROOT /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Fri Jan 19 2007 Chris Lumens <clumens@redhat.com> - 11.2.0.13-1 +- Kickstart and upgrade are no longer installclasses. +- Update x86_64 syslinux config (katzj). +- Support %packages --default (#221305). +- Fix early kickstart UI traceback. +- Remove cruft in x86 images (katzj). +- Fix error handling in loader netconfig screen (dcantrell). +- Add libthai to graphical install (katzj). + * Thu Jan 18 2007 Jeremy Katz <katzj@redhat.com> - 11.2.0.12-1 - Fix so that package selection in the yum backend is actually enabled - UI tweaks so that we work better with a real window manager diff --git a/iw/examine_gui.py b/iw/examine_gui.py index 3f5218eaf..9bb9c740b 100644 --- a/iw/examine_gui.py +++ b/iw/examine_gui.py @@ -17,12 +17,9 @@ from iw_gui import * from pixmapRadioButtonGroup_gui import pixmapRadioButtonGroup from rhpl.translate import _, N_ from constants import * -from upgrade import * +import upgrade from flags import flags -import upgradeclass -UpgradeClass = upgradeclass.InstallClass - UPGRADE_STR = "upgrade" REINSTALL_STR = "reinstall" @@ -31,11 +28,9 @@ class UpgradeExamineWindow (InstallWindow): windowTitle = N_("Upgrade Examine") def getNext (self): - if self.doupgrade: - # set the install class to be an upgrade - c = UpgradeClass(flags.expert) - c.setSteps(self.anaconda.dispatch) - c.setInstallData(self.anaconda) + if self.doupgrade: + upgrade.setSteps(self.anaconda) + self.anaconda.id.setUpgrade(True) rootfs = self.parts[self.upgradecombo.get_active()] self.anaconda.id.upgradeRoot = [(rootfs[0], rootfs[1])] diff --git a/kickstart.py b/kickstart.py index a11e43742..90acb5068 100644 --- a/kickstart.py +++ b/kickstart.py @@ -27,6 +27,7 @@ import partRequests import urlgrabber.grabber as grabber import lvm import warnings +import upgrade from pykickstart.constants import * from pykickstart.errors import * from pykickstart.parser import * @@ -975,9 +976,7 @@ def setSteps(anaconda): upgrade = ksdata.upgrade.upgrade if upgrade: - from upgradeclass import InstallClass - theUpgradeclass = InstallClass(0) - theUpgradeclass.setSteps(anaconda) + upgrade.setSteps(anaconda) # we have no way to specify migrating yet dispatch.skipStep("upgrademigfind") diff --git a/textw/upgrade_text.py b/textw/upgrade_text.py index 71727e85a..505afb0e1 100644 --- a/textw/upgrade_text.py +++ b/textw/upgrade_text.py @@ -20,8 +20,6 @@ from snack import * from fsset import * from flags import flags from constants import * -import upgradeclass -UpgradeClass = upgradeclass.InstallClass from rhpl.translate import _ @@ -223,9 +221,8 @@ class UpgradeExamineWindow: root = parts[choice - 1] if root is not None: - c = UpgradeClass(flags.expert) - c.setSteps(anaconda.dispatch) - c.setInstallData(anaconda) + upgrade.setSteps(anaconda) + anaconda.id.setUpgrade(True) anaconda.id.upgradeRoot = [(root[0], root[1])] anaconda.id.rootParts = parts diff --git a/upgrade.py b/upgrade.py index 047181b39..e5a8b5644 100644 --- a/upgrade.py +++ b/upgrade.py @@ -3,7 +3,7 @@ # # Matt Wilson <msw@redhat.com> # -# Copyright 2001-2006 Red Hat, Inc. +# Copyright 2001-2007 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -359,3 +359,42 @@ def upgradeMountFilesystems(anaconda): anaconda.id.fsset.formatSwap(anaconda.rootPath, forceFormat=True) anaconda.id.fsset.turnOnSwap(anaconda.rootPath, upgrading=True) anaconda.id.fsset.mkDevRoot(anaconda.rootPath) + +def setSteps(anaconda): + dispatch = anaconda.dispatch + dispatch.setStepList( + "language", + "keyboard", + "welcome", + "installtype", + "findrootparts", + "findinstall", + "partitionobjinit", + "upgrademount", + "upgrademigfind", + "upgrademigratefs", + "upgradecontinue", + "reposetup", + "upgbootloader", + "checkdeps", + "dependencies", + "confirmupgrade", + "postselection", + "install", + "migratefilesystems", + "preinstallconfig", + "installpackages", + "postinstallconfig", + "instbootloader", + "dopostaction", + "methodcomplete", + "copylogs", + "complete" + ) + + if rhpl.getArch() != "i386" and rhpl.getArch() != "x86_64": + dispatch.skipStep("bootloader") + dispatch.skipStep("bootloaderadvanced") + + if rhpl.getArch() != "i386" and rhpl.getArch() != "x86_64": + dispatch.skipStep("upgbootloader") diff --git a/upgradeclass.py b/upgradeclass.py deleted file mode 100644 index 3d832dfe9..000000000 --- a/upgradeclass.py +++ /dev/null @@ -1,75 +0,0 @@ -# this is the prototypical class for upgrades -# -# Copyright 2001-2004 Red Hat, Inc. -# -# This software may be freely redistributed under the terms of the GNU -# library public license. -# -# You should have received a copy of the GNU Library Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -from installclass import getBaseInstallClass -from rhpl.translate import N_, _ - -import os -import iutil -import rhpl - -baseclass = getBaseInstallClass() - -class InstallClass(baseclass): - name = N_("Upgrade Existing System") - pixmap = "upgrade.png" - sortPriority = 999999 - - parentClass = ( _("Upgrade"), "upgrade.png" ) - - def requiredDisplayMode(self): - return 't' - - def setSteps(self, anaconda): - dispatch = anaconda.dispatch - dispatch.setStepList( - "language", - "keyboard", - "welcome", - "installtype", - "findrootparts", - "findinstall", - "partitionobjinit", - "upgrademount", - "upgrademigfind", - "upgrademigratefs", - "upgradecontinue", - "reposetup", - "upgbootloader", - "checkdeps", - "dependencies", - "confirmupgrade", - "postselection", - "install", - "migratefilesystems", - "preinstallconfig", - "installpackages", - "postinstallconfig", - "instbootloader", - "dopostaction", - "methodcomplete", - "copylogs", - "complete" - ) - - if rhpl.getArch() != "i386" and rhpl.getArch() != "x86_64": - dispatch.skipStep("bootloader") - dispatch.skipStep("bootloaderadvanced") - - if rhpl.getArch() != "i386" and rhpl.getArch() != "x86_64": - dispatch.skipStep("upgbootloader") - - def setInstallData(self, anaconda): - baseclass.setInstallData(self, anaconda) - anaconda.id.setUpgrade(True) - - def __init__(self, expert): - baseclass.__init__(self, expert) |