diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-08-28 09:35:57 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-08-28 09:35:57 +0200 |
| commit | 375c0d90adfab90c66cc1005c5ca0ab588328262 (patch) | |
| tree | 688ce53f51c39e34c496763b4392b92dbaa393fa /SoftwareProperties/SoftwareProperties.py | |
| parent | 37827c0f97d0711820443325d3d1c65b755cdfb4 (diff) | |
| parent | 558f70b24693a1692be2ab79c4047af762f9e010 (diff) | |
| download | python-apt-375c0d90adfab90c66cc1005c5ca0ab588328262.tar.gz | |
* merged with the ~ubuntu-core-dev branch
Diffstat (limited to 'SoftwareProperties/SoftwareProperties.py')
| -rw-r--r-- | SoftwareProperties/SoftwareProperties.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 8ae98b55..38b55ef5 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -305,11 +305,12 @@ class SoftwareProperties(SimpleGladeApp): for server in self.distro.used_servers: if not re.match(server, self.distro.main_server) and \ not re.match(server, self.distro.nearest_server): - #FIXME: an ubuntu hack - i = server.find("http://") + # FIXME: use regexp here instead of this + country = "" + i = server.find("://") l = server.find(".archive.ubuntu.com") if i != -1 and l != -1: - country = server[i+7:l] + country = server[i+len("://"):l] if self.distro.countries.has_key(country): # TRANSLATORS: %s is a country server_store.append([_("Server for %s") % \ |