summaryrefslogtreecommitdiff
path: root/DistUpgrade/DistUpgradeControler.py
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-05-12 19:17:23 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-05-12 19:17:23 +0200
commitf22af48d8447393ad30561845f45d18a052d057c (patch)
treeab5ea55ec87607d5a765fc02dfd041a0a56cd853 /DistUpgrade/DistUpgradeControler.py
parentbd866f389dcf33182d0e4a41912c93bfe87848b3 (diff)
downloadpython-apt-f22af48d8447393ad30561845f45d18a052d057c.tar.gz
* DistUpgrade/DistUpgradeViewGtk.py:
- make the progress strings translatable in a useful way
Diffstat (limited to 'DistUpgrade/DistUpgradeControler.py')
-rw-r--r--DistUpgrade/DistUpgradeControler.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 583fe4bd..1bfde361 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -91,7 +91,7 @@ class DistUpgradeControler(object):
for entry in self.sources:
# ignore invalid records (but update disabled ones)
# or cdrom entries
- if entry.invalid or entry.uri.startswith("cdrom:"):
+ if entry.invalid or entry.uri.startswith("cdrom:") or entry.disabled:
continue
logging.debug("examining: '%s'" % entry)
# check if it's a mirror (or offical site)
@@ -375,9 +375,9 @@ class DistUpgradeControler(object):
self._view.information(_("Some software no longer officially "
"supported"),
_("These installed packages are "
- "no longer officially supported,
- and are now only
- community-supported ('universe').\n\n"
+ "no longer officially supported, "
+ "and are now only "
+ "community-supported ('universe').\n\n"
"If you don't have 'universe' enabled "
"these packages will be suggested for "
"removal in the next step. "),