From a9edef04412f95f3c2bc6da10388673c695a6ac3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 24 Aug 2006 12:12:57 +0200 Subject: * SoftwareProperties/SoftwareProperties.py: - be slightly better about finding out about the country --- SoftwareProperties/SoftwareProperties.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'SoftwareProperties') 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") % \ -- cgit v1.2.3