From d87c4020340ed0c869346c5b569a3b2e261b7be2 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sun, 19 Feb 2006 20:39:45 +0100 Subject: * dialog_confirm_changes: - Show a question mark icon in the confirm changes dialog - Fixed some spacing in the confirm changes dialog - Use a more informative label for the ob button and the summary - Do not show the close button of the wm - Use plural gettext in the summary - Include the summary into the alert message * common error dialogs: - Do not show the close button of the wm - Hopefully made the wording of some error dialogs clearer - Show the missing free space on the corresponding error dialog --- DistUpgrade/DistUpgradeControler.py | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'DistUpgrade/DistUpgradeControler.py') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 9fa717fe..6dcc0e2a 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -187,13 +187,16 @@ class DistUpgradeControler(object): 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, + free_at_least = apt_pkg.SizeToStr(self.cache.requiredDownload-free) + self._view.error(_("Not enough free disk space"), + _("The upgrade aborts now. " + "Please free at least %s of disk space. " + "Empty your trash and remove temporary " + "packages of former installations using " + "'sudo apt-get clean'." % free_at_least )) + return False + res = self._view.confirmChanges(_("Do you want to start the upgrade?"), + changes, self.cache.requiredDownload) return res @@ -208,12 +211,11 @@ class DistUpgradeControler(object): res = self.cache.commit(fprogress,iprogress) except SystemError, e: # installing the packages failed, can't be retried - self._view.error(_("Error during commit"), - _("Some problem occured during the upgrade. " - "Most likely packages failed to install. " - "Try 'sudo apt-get install -f' or synaptic " - "to fix your system."), - "%s" % e) + self._view.error(_("Could not install the upgrades"), + _("The upgrade aborts now. Your system " + "can be in an unusable state. Please " + "try 'sudo apt-get install -f' or Synaptic " + "to fix your system."), "%s" % e) return False except IOError, e: # fetch failed, will be retried @@ -225,11 +227,10 @@ class DistUpgradeControler(object): # maximum fetch-retries reached without a successful commit logging.debug("giving up on fetching after maximum retries") - self._view.error(_("Error fetching the packages"), - _("Some problem occured during the fetching " - "of the packages. This is most likely a network " - "problem. Please check your network and try " - "again. "), + self._view.error(_("Could not download the upgrades"), + _("The upgrade aborts now. Please check your "\ + "internet connection or "\ + "installation media and try again. "), "%s" % e) # abort here because we want our sources.list back self.abort() -- cgit v1.2.3