diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-04-28 16:33:59 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-04-28 16:33:59 +0200 |
| commit | 1fbacfc19a5276e2036598bcb48ef38936e4bfeb (patch) | |
| tree | e23e42fd1a7a9c620687d6a29fb451dcaf6562cf /DistUpgrade | |
| parent | 158add49781967e83b951816a81fe70517643d1c (diff) | |
| download | python-apt-1fbacfc19a5276e2036598bcb48ef38936e4bfeb.tar.gz | |
* DistUpgrade/DistUpgradeControler.py:
- specialcase security and not inlcude it in "fromDistFound"
Diffstat (limited to 'DistUpgrade')
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 8 | ||||
| -rw-r--r-- | DistUpgrade/TODO | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 18f452e6..59f4242c 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -90,18 +90,20 @@ class DistUpgradeControler(object): for mirror in valid_mirrors: if is_mirror(mirror,entry.uri): validMirror = True + # security is a special case + res = not entry.uri.startswith("http://security.ubuntu.com") if entry.dist in toDists: # so the self.sources.list is already set to the new # distro logging.debug("entry '%s' is already set to new dist" % entry) - foundToDist = True + foundToDist = res elif entry.dist in fromDists: - foundToDist = True + foundToDist = res entry.dist = toDists[fromDists.index(entry.dist)] logging.debug("entry '%s' updated to new dist" % entry) else: # disable all entries that are official but don't - # point to the "from" dist + # point to either "to" or "from" dist entry.disabled = True logging.debug("entry '%s' was disabled (unknown dist)" % entry) # it can only be one valid mirror, so we can break here diff --git a/DistUpgrade/TODO b/DistUpgrade/TODO index ec6a8c5a..c32e6bc3 100644 --- a/DistUpgrade/TODO +++ b/DistUpgrade/TODO @@ -21,6 +21,8 @@ MUSTFIX: main->universe. We could ship a list of demotions. * [kamion]: we could use debconf-frontend=dialog and then detect the ansi seqence that clear the screen and open the terminal then + -> trouble: vte does not give me the raw codes but only the + text (as \n\n\n\n\n... for cls) breezy->dapper -------------- |