diff options
| -rw-r--r-- | installclasses/upgradeclass.py | 2 | ||||
| -rw-r--r-- | iw/lilo_gui.py | 2 | ||||
| -rw-r--r-- | iw/upgrade_swap_gui.py | 20 | ||||
| -rw-r--r-- | upgrade.py | 18 | ||||
| -rw-r--r-- | upgradeclass.py | 2 |
5 files changed, 15 insertions, 29 deletions
diff --git a/installclasses/upgradeclass.py b/installclasses/upgradeclass.py index 8dff1d6aa..4d758f46c 100644 --- a/installclasses/upgradeclass.py +++ b/installclasses/upgradeclass.py @@ -22,10 +22,10 @@ class InstallClass(BaseInstallClass): "welcome", "installtype", "findinstall", + "partitiondone", "addswap", "upgradecontinue", "readcomps", -# "indivpackage", "findpackages", "bootloader", "checkdeps", diff --git a/iw/lilo_gui.py b/iw/lilo_gui.py index c9cd0ac08..173f6e985 100644 --- a/iw/lilo_gui.py +++ b/iw/lilo_gui.py @@ -247,7 +247,7 @@ class LiloWindow (InstallWindow): imageList = bl.images.getImages() defaultDevice = bl.images.getDefault() - self.ignoreSignals = 1 + self.ignoreSignals = 0 format = "/dev/%s" diff --git a/iw/upgrade_swap_gui.py b/iw/upgrade_swap_gui.py index d053fa588..defc74047 100644 --- a/iw/upgrade_swap_gui.py +++ b/iw/upgrade_swap_gui.py @@ -29,20 +29,6 @@ class UpgradeSwapWindow (InstallWindow): windowTitle = N_("Upgrade Swap Partition") htmlTag = "upswapfile" - def getPrev (self): - # we're doing an upgrade, offer choice of aborting upgrade. - # we can't allow them to go back in install, since we've - # started swap and mounted the systems filesystems - # if we've already started an upgrade, cannot back out - rc = queryUpgradeContinue(self.todo.intf) - - if not rc: - raise gui.StayOnScreen - else: - import sys - print _("Aborting upgrade") - sys.exit(0) - def getNext (self): #-If the user doesn't need to add swap, we don't do anything if not self.neededSwap: @@ -74,11 +60,9 @@ class UpgradeSwapWindow (InstallWindow): raise gui.StayOnScreen else: - if self.todo.setupFilesystems: - upgrade.createSwapFile(self.todo.instPath, self.todo.fstab, - mnt, val) + if flags.setupFilesystems: + upgrade.createSwapFile(instPath, fsset, mnt, val) - self.todo.upgradeFindPackages() return None def toggle (self, data): diff --git a/upgrade.py b/upgrade.py index 855ac90aa..c2502b8ee 100644 --- a/upgrade.py +++ b/upgrade.py @@ -93,12 +93,13 @@ def swapSuggestion(instPath, fsset): fsList.append(info) else: for entry in fsset.entries: - if not entry.isMounted(): - continue + # XXX multifsify if (entry.fsystem.getName() == "ext2" or entry.fsystem.getName() == "ext3"): + if flags.setupFilesystems and not entry.isMounted(): + continue space = isys.pathSpaceAvailable(instPath + entry.mountpoint) - info = (mntpoint, entry.device.getDevice(), space) + info = (entry.mountpoint, entry.device.getDevice(), space) fsList.append(info) suggestion = mem * 2 - swap @@ -118,7 +119,8 @@ def swapfileExists(swapname): except: return 0 -def createSwapFile(instPath, theFstab, mntPoint, size): +# XXX fix me. +def createSwapFile(instPath, thefsset, mntPoint, size): fstabPath = instPath + "/etc/fstab" prefix = "" if theFstab.rootOnLoop(): @@ -200,7 +202,7 @@ def upgradeFindPackages (intf, method, id, instPath): global rebuildTime if not rebuildTime: rebuildTime = str(int(time.time())) - method.mergeFullHeaders(id.hdlist) + method.mergeFullHeaders(id.hdList) win = intf.waitWindow (_("Finding"), _("Finding packages to upgrade...")) @@ -236,7 +238,7 @@ def upgradeFindPackages (intf, method, id, instPath): rpm.addMacro("_dbpath", id.dbpath) rpm.addMacro("_dbapi", "3") try: - packages = rpm.findUpgradeSet (id.hdlist.hdlist, instPath) + packages = rpm.findUpgradeSet (id.hdList.hdlist, instPath) except rpm.error: iutil.rmrf (rebuildpath) win.pop() @@ -252,14 +254,14 @@ def upgradeFindPackages (intf, method, id, instPath): comp.unselect() # unselect all packages - for package in id.hdlist.packages.values (): + for package in id.hdList.packages.values (): package.selected = 0 hasX = 0 hasFileManager = 0 # turn on the packages in the upgrade set for package in packages: - id.hdlist[package[rpm.RPMTAG_NAME]].select() + id.hdList[package[rpm.RPMTAG_NAME]].select() if package[rpm.RPMTAG_NAME] == "XFree86": hasX = 1 if package[rpm.RPMTAG_NAME] == "gmc": diff --git a/upgradeclass.py b/upgradeclass.py index 8dff1d6aa..4d758f46c 100644 --- a/upgradeclass.py +++ b/upgradeclass.py @@ -22,10 +22,10 @@ class InstallClass(BaseInstallClass): "welcome", "installtype", "findinstall", + "partitiondone", "addswap", "upgradecontinue", "readcomps", -# "indivpackage", "findpackages", "bootloader", "checkdeps", |