diff options
| -rw-r--r-- | aptsources/distinfo.py | 3 | ||||
| -rw-r--r-- | data/templates/Ubuntu.info.in | 6 | ||||
| -rw-r--r-- | debian/changelog | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py index 5c8f7782..9b438701 100644 --- a/aptsources/distinfo.py +++ b/aptsources/distinfo.py @@ -196,7 +196,8 @@ class DistInfo: template.match_uri = value elif field == 'MatchURI-%s' % self.arch: template.match_uri = value - elif field == 'MirrorsFile': + elif (field == 'MirrorsFile' or + field == 'MirrorsFile-%s' % self.arch): if not map_mirror_sets.has_key(value): mirror_set = {} try: diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 6d1d0819..c3cfe6df 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -6,7 +6,8 @@ BaseURI: http://archive.ubuntu.com/ubuntu/ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 8.10 'Intrepid Ibex' Component: main _CompDescription: Officially supported @@ -60,7 +61,8 @@ BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com -MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 8.04 'Hardy Heron' Component: main _CompDescription: Officially supported diff --git a/debian/changelog b/debian/changelog index b2ee0469..0f046f26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,8 +19,8 @@ python-apt (0.7.5) UNRELEASED; urgency=low * debian/README.source: - added (basic) documentation how to build python-apt * aptsources/distinfo.py: - - support arch specific BaseURI and MatchURI in the distinfo - template + - support arch specific BaseURI, MatchURI and MirrosFile fields + in the distinfo template -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 04 Jan 2008 21:17:00 +0100 |