diff options
| -rw-r--r-- | apt/cdrom.py | 1 | ||||
| -rw-r--r-- | aptsources/distro.py | 22 | ||||
| -rw-r--r-- | data/templates/Ubuntu.info.in | 12 | ||||
| -rw-r--r-- | debian/changelog | 6 |
4 files changed, 25 insertions, 16 deletions
diff --git a/apt/cdrom.py b/apt/cdrom.py index 8d73339c..9d4b62cb 100644 --- a/apt/cdrom.py +++ b/apt/cdrom.py @@ -1,4 +1,3 @@ - import apt_pkg from progress import CdromProgress 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]) diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 56a02436..7e852dd7 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -44,12 +44,12 @@ _Description: Recommended updates Suite: feisty-proposed ParentSuite: feisty RepositoryType: deb -_Description: Proposed updates +_Description: Pre-released updates Suite: feisty-backports ParentSuite: feisty RepositoryType: deb -_Description: Backported updates +_Description: Unsupported updates Suite: edgy RepositoryType: deb @@ -95,12 +95,12 @@ _Description: Recommended updates Suite: edgy-proposed ParentSuite: edgy RepositoryType: deb -_Description: Proposed updates +_Description: Pre-released updates Suite: edgy-backports ParentSuite: edgy RepositoryType: deb -_Description: Backported updates +_Description: Unsupported updates Suite: dapper RepositoryType: deb @@ -146,12 +146,12 @@ _Description: Recommended updates Suite: dapper-proposed ParentSuite: dapper RepositoryType: deb -_Description: Proposed updates +_Description: Pre-released updates Suite: dapper-backports ParentSuite: dapper RepositoryType: deb -_Description: Backported updates +_Description: Unsupported updates Suite: breezy RepositoryType: deb diff --git a/debian/changelog b/debian/changelog index c67bc8ea..974662bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-apt (0.6.20ubuntu13) feisty; urgency=low + + * fix in the duplicated source checking (thanks to Sebastian Heinlein) + + -- + python-apt (0.6.20ubuntu12) feisty; urgency=low * apt/cdrom.py: |