diff options
| author | glatzor@ubuntu.com <> | 2006-07-27 22:34:11 +0200 |
|---|---|---|
| committer | glatzor@ubuntu.com <> | 2006-07-27 22:34:11 +0200 |
| commit | 7403f3888293e0c9ff544a218decaf6b428b2396 (patch) | |
| tree | 91e1f7fb24c696b7eb409acaf0b6a5f8c43fa0df /SoftwareProperties/aptsources.py | |
| parent | c2a2f69a9a9ee1f45290b15e76f6098c4b28bd98 (diff) | |
| parent | 2c1051ac180cfa72705b63c5080771b69dbeaca7 (diff) | |
| download | python-apt-7403f3888293e0c9ff544a218decaf6b428b2396.tar.gz | |
* merge with mvo
* try to find a nice country name for custom mirrors
* if available select a custom mirror in the combobox
Diffstat (limited to 'SoftwareProperties/aptsources.py')
| -rw-r--r-- | SoftwareProperties/aptsources.py | 55 |
1 files changed, 1 insertions, 54 deletions
diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py index c111e4ff..40b55dfa 100644 --- a/SoftwareProperties/aptsources.py +++ b/SoftwareProperties/aptsources.py @@ -30,7 +30,7 @@ import shutil import time import os.path -import pdb +#import pdb from UpdateManager.Common.DistInfo import DistInfo @@ -416,61 +416,8 @@ class SourceEntryMatcher: for suite in dist.suites: if suite.match_uri != None: self.templates.append(suite) - - # FIXME: The specifications should go into the .info files return - # DEBIAN - debian_comps = ["^main$","^contrib$","^non-free$","^non-US$"] - debian_comps_descr = [_("Officially supported"), - _("Contributed software"), - _("Non-free software"), - _("US export restricted software") - ] - - # dists by name - self.dist_list.append(self.MatchDist(".*debian.org/debian", - "^sarge$", - _("Debian 3.1 \"Sarge\""), - debian_comps, debian_comps_descr)) - self.dist_list.append(self.MatchDist(".*debian.org/debian", - "^woody$", - _("Debian 3.0 \"Woody\""), - debian_comps, debian_comps_descr)) - # securtiy - self.dist_list.append(self.MatchDist(".*security.debian.org", - "^stable.*$", - _("Debian Stable Security Updates"), - debian_comps, debian_comps_descr)) - # dists by status - self.dist_list.append(self.MatchDist(".*debian.org/debian", - "^stable$", - _("Debian Stable"), - debian_comps, debian_comps_descr)) - self.dist_list.append(self.MatchDist(".*debian.org/debian", - "^testing$", - _("Debian Testing"), - debian_comps, debian_comps_descr)) - self.dist_list.append(self.MatchDist(".*debian.org/debian", - "^unstable$", - _("Debian Unstable \"Sid\""), - debian_comps, debian_comps_descr)) - - # non-us - self.dist_list.append(self.MatchDist(".*debian.org/debian-non-US", - "^stable.*$", - _("Debian Non-US (Stable)"), - debian_comps, debian_comps_descr)) - self.dist_list.append(self.MatchDist(".*debian.org/debian-non-US", - "^testing.*$", - _("Debian Non-US (Testing)"), - debian_comps, debian_comps_descr)) - self.dist_list.append(self.MatchDist(".*debian.org/debian-non-US", - "^unstable.*$", - _("Debian Non-US (Unstable)"), - debian_comps, debian_comps_descr, - SOURCE_SYSTEM)) - def match(self, source): """Add a matching template to the source""" _ = gettext.gettext |