diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-08-29 23:43:05 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-08-29 23:43:05 +0200 |
| commit | 127e052a9822182b3f795b46b9fe459aaeb2e87a (patch) | |
| tree | a76749909e031d42fce8f04e25fd12fdbc24dc83 | |
| parent | 4f180848e8b01002379173e27a19f0aa5c13ac8b (diff) | |
| download | python-apt-127e052a9822182b3f795b46b9fe459aaeb2e87a.tar.gz | |
* DistUpgrade/DistUpgrade.cfg:
- ubuntu-minimal is the new meta-package of choice
* DistUpgrade/DistUpgradeViewGtk.py:
- some polish for the time display
| -rw-r--r-- | DistUpgrade/Changelog | 2 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgrade.cfg | 2 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeViewGtk.py | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index f8da8a54..0ebf76f8 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,5 +1,7 @@ 2006-08-29: - always enable the "main" component to make sure it is available + - add download estimate + - add --cdrom switch to make cdrom based dist-upgrades possible 2006-08-18: - sort the demoted software list 2006-07-31: diff --git a/DistUpgrade/DistUpgrade.cfg b/DistUpgrade/DistUpgrade.cfg index 9d6001fb..edd32011 100644 --- a/DistUpgrade/DistUpgrade.cfg +++ b/DistUpgrade/DistUpgrade.cfg @@ -6,7 +6,7 @@ View=DistUpgradeViewGtk [Distro] # the meta-pkgs we support MetaPkgs=ubuntu-desktop, kubuntu-desktop, edubuntu-desktop, xubuntu-desktop -BaseMetaPkgs=ubuntu-base +BaseMetaPkgs=ubuntu-minimal PostUpgradePurge=xorg-common Demotions=demoted.cfg diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index b81f9cf7..da2d12a9 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -472,14 +472,14 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): "%s packages are going to be upgraded.", pkgs_upgrade) % pkgs_upgrade msg +=" " - if downloadSize > 0: - msg += _("You have to download a total of %s. " %\ + msg += _("\n\nYou have to download a total of %s. " %\ apt_pkg.SizeToStr(downloadSize)) - msg += estimatedDownloadTime(downloadSize) + msg += estimatedDownloadTime(downloadSize) + msg += "." if (pkgs_upgrade + pkgs_inst + pkgs_remove) > 100: - msg += "\n\n%s" % _("The upgrade can take several hours and "\ + msg += "\n\n%s" % _("Fetching and installing the upgrade can take several hours and "\ "cannot be canceled at any time later.") msg += "\n\n<b>%s</b>" % _("To prevent data loss close all open "\ |