From 5bd807b1a1b05d8ba44a6c330cd55222b9fe9a46 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 May 2008 11:57:55 +0200 Subject: * aptsources/distinfo.py: - support arch specific BaseURI and MatchURI in the distinfo template --- data/templates/Ubuntu.info.in | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'data') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 5561862d..30cbaa5e 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -3,6 +3,8 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/chang Suite: intrepid RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ +BaseURI-powerpc: http://ports.ubuntu.com/ubuntu/ +MatchURI-powerpc: ports.ubuntu.com MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 8.10 'Intrepid Ibex' @@ -56,6 +58,8 @@ Suite: hardy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu +BaseURI-powerpc: http://ports.ubuntu.com/ubuntu/ +MatchURI-powerpc: ports.ubuntu.com MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 8.04 'Hardy Heron' Component: main -- cgit v1.2.3 From ec243913efd84b2cf8655f7ab82c12398e4f7bc8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 May 2008 12:01:11 +0200 Subject: security is only on ports.ubuntu.com now too --- data/templates/Ubuntu.info.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 30cbaa5e..6d1d0819 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -3,7 +3,7 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/chang Suite: intrepid RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -BaseURI-powerpc: http://ports.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 @@ -58,7 +58,7 @@ Suite: hardy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu -BaseURI-powerpc: http://ports.ubuntu.com/ubuntu/ +BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 8.04 'Hardy Heron' @@ -90,6 +90,8 @@ ParentSuite: hardy RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-powerpc: http://ports.ubuntu.com/ +MatchURI-powerpc: ports.ubuntu.com/ubuntu _Description: Important security updates Suite: hardy-updates -- cgit v1.2.3 From 35d1d39728f6e2ef5e025b2359ee6d53911f9cc1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 May 2008 12:08:14 +0200 Subject: make MirrorsFile arch specific too --- aptsources/distinfo.py | 3 ++- data/templates/Ubuntu.info.in | 6 ++++-- debian/changelog | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'data') 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 Fri, 04 Jan 2008 21:17:00 +0100 -- cgit v1.2.3