diff options
Diffstat (limited to 'DistUpgrade')
| -rw-r--r-- | DistUpgrade/DistUpgrade.glade | 8 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 15 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeViewGtk.py | 6 |
3 files changed, 20 insertions, 9 deletions
diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index 55072576..fac71f8f 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -315,8 +315,8 @@ <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property> <property name="fraction">0</property> <property name="pulse_step">0.10000000149</property> - <property name="text" translatable="yes"> </property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="text" translatable="yes"> </property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> </widget> <packing> <property name="padding">0</property> @@ -338,7 +338,7 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> <property name="width_chars">-1</property> <property name="single_line_mode">False</property> <property name="angle">0</property> @@ -709,7 +709,7 @@ <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <property name="response_id">0</property> + <property name="response_id">-8</property> <child> <widget class="GtkAlignment" id="alignment1"> diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 0fdb8bbd..b90224a2 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -27,6 +27,7 @@ import os import subprocess import logging import re +import statvfs from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp from SoftwareProperties.aptsources import SourcesList, SourceEntry @@ -167,6 +168,16 @@ class DistUpgradeControler(object): # log the changes for debuging self._logChanges() # ask the user if he wants to do the changes + archivedir = apt_pkg.Config.FindDir("Dir::Cache::archives ") + st = os.statvfs(archivedir) + free = st[statvfs.F_BAVAIL]*st[statvfs.F_FRSIZE] + if self.cache.requiredDownload > free: + self._view.error(_("Not enough free space"), + _("There is not enough free space on your " + "system to download the required pacakges. " + "Please free some space before trying again " + "with e.g. 'sudo apt-get clean'")) + return False res = self._view.confirmChanges(_("Perform Upgrade?"),changes, self.cache.requiredDownload) return res @@ -262,15 +273,17 @@ class DistUpgradeControler(object): if not self.askDistUpgrade(): self.abort() - self._view.updateStatus(_("Performing the upgrade")) + self._view.updateStatus(_("Upgrading")) if not self.doDistUpgrade(): self.abort() # do post-upgrade stuff self._view.setStep(4) + self._view.updateStatus(_("Searching for obsolete software")) self.doPostUpgrade() # done, ask for reboot + self._view.updateStatus(_("System upgrade is complete.")) if self.askForReboot(): subprocess.call(["reboot"]) diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 77307611..f5bceef0 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -119,9 +119,7 @@ class GtkInstallProgressAdapter(InstallProgress): # FIXME: add support for the timeout # of the terminal (to display something useful then) # -> longer term, move this code into python-apt - #self.label_status.show() self.label_status.set_text(_("Installing updates ...")) - #self.progress.show() self.progress.set_fraction(0.0) self.progress.set_text(" ") self.expander.set_sensitive(True) @@ -166,9 +164,9 @@ class GtkInstallProgressAdapter(InstallProgress): while not self.finished: self.updateInterface() return self.apt_status - def finishUpdate(self): + # def finishUpdate(self): #self.progress.hide() - self.label_status.set_text("") + #self.label_status.set_text("") def updateInterface(self): InstallProgress.updateInterface(self) self.progress.set_fraction(self.percent/100.0) |