diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-03-12 18:02:00 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-03-12 18:02:00 +0100 |
| commit | 2658ad16e4dc19973ef4b853b94fea6efd9ddc00 (patch) | |
| tree | 860609e8bcb3c79e690aca4774018b328a6adfd1 /aptsources | |
| parent | ec30e020ffdcb6cf5f11fd1e761083bd9711c41c (diff) | |
| parent | 3df4fd5eeb785bc335f8b996d13b39ea69d90770 (diff) | |
| download | python-apt-2658ad16e4dc19973ef4b853b94fea6efd9ddc00.tar.gz | |
* fix in the duplicated source checking (thanks to Sebastian Heinlein)
Diffstat (limited to 'aptsources')
| -rw-r--r-- | aptsources/distro.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/aptsources/distro.py b/aptsources/distro.py index 7acd1942..a95fecdd 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -252,13 +252,7 @@ class Distribution: def change_server(self, uri): ''' Change the server of all distro specific sources to a given host ''' - sources = [] - seen = [] - self.default_server = uri - sources.extend(self.main_sources) - sources.extend(self.child_sources) - sources.extend(self.source_code_sources) - for source in sources: + def change_server_of_source(source, uri, seen): # Avoid creating duplicate entries source.uri = uri for comp in source.comps: @@ -268,6 +262,16 @@ class Distribution: seen.append([source.uri, source.dist, comp]) if len(source.comps) < 1: self.sourceslist.remove(source) + seen_binary = [] + seen_source = [] + self.default_server = uri + sources = [] + sources.extend(self.main_sources) + sources.extend(self.child_sources) + for source in sources: + change_server_of_source(source, uri, seen_binary) + for source in self.source_code_sources: + change_server_of_source(source, uri, seen_source) def is_codename(self, name): ''' Compare a given name with the release codename. ''' @@ -275,13 +279,13 @@ class Distribution: return True else: return False - + def get_server_list(self): ''' Return a list of used and suggested servers ''' # Store all available servers: # Name, URI, active mirrors = [] - + mirrors.append([_("Main server"), self.main_server, len(self.used_servers) == 1 and self.used_servers[0] == self.main_server]) |
