diff options
| -rw-r--r-- | iw/upgrade_swap_gui.py | 5 | ||||
| -rw-r--r-- | text.py | 2 | ||||
| -rw-r--r-- | textw/upgrade_text.py | 4 | ||||
| -rw-r--r-- | upgrade.py | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/iw/upgrade_swap_gui.py b/iw/upgrade_swap_gui.py index 0a745e856..bcd19ea35 100644 --- a/iw/upgrade_swap_gui.py +++ b/iw/upgrade_swap_gui.py @@ -72,8 +72,9 @@ class UpgradeSwapWindow (InstallWindow): else: threads_leave() if self.todo.setupFilesystems: - upgrade.createSwapFile(self.todo.instPath, self.todo.fstab, mnt, val, - self.todo.intf.progressWindow) + upgrade.createSwapFile(self.todo.instPath, self.todo.fstab, + mnt, val) + self.todo.upgradeFindPackages() threads_enter() return None @@ -771,6 +771,8 @@ class ProgressWindow: def pop(self): self.screen.popWindow() self.screen.refresh() + del self.scale + self.scale = None def set (self, amount): self.scale.set (amount) diff --git a/textw/upgrade_text.py b/textw/upgrade_text.py index bdbe01670..09a3857b8 100644 --- a/textw/upgrade_text.py +++ b/textw/upgrade_text.py @@ -119,8 +119,8 @@ class UpgradeSwapWindow: else: screen.popWindow() if todo.setupFilesystems: - upgrade.createSwapFile(todo.instPath, todo.fstab, mnt, val, - todo.intf.progressWindow) + upgrade.createSwapFile(todo.instPath, todo.fstab, + mnt, val) todo.upgradeFindPackages () return INSTALL_OK diff --git a/upgrade.py b/upgrade.py index 5d0889d43..873620caa 100644 --- a/upgrade.py +++ b/upgrade.py @@ -159,7 +159,7 @@ def swapfileExists(swapname): except: return 0 -def createSwapFile(instPath, theFstab, mntPoint, size, progressWindow): +def createSwapFile(instPath, theFstab, mntPoint, size): fstabPath = instPath + "/etc/fstab" prefix = "" if theFstab.rootOnLoop(): |