Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock x-debbugs-cc: piuparts-devel@lists.alioth.debian.org Dear release team, This is an unblock approval request for piuparts fixing an important bug, namely s#cdn.debian.net#http.debian.net#g, this is the full debdiff: $ debdiff piuparts_0.61.dsc piuparts_0.62.dsc diff -Nru piuparts-0.61/conf/piuparts.conf.sample piuparts-0.62/conf/piuparts.conf.sample --- piuparts-0.61/conf/piuparts.conf.sample 2014-07-26 13:41:38.000000000 +0200 +++ piuparts-0.62/conf/piuparts.conf.sample 2015-01-06 10:33:01.000000000 +0100 @@ -8,7 +8,7 @@ [global] sections = sid -mirror = http://cdn.debian.net/debian +mirror = http://http.debian.net/debian master-host = localhost master-user = piupartsm piuparts-command = sudo piuparts --scriptsdir /etc/piuparts/scripts diff -Nru piuparts-0.61/debian/changelog piuparts-0.62/debian/changelog --- piuparts-0.61/debian/changelog 2014-12-03 19:55:30.000000000 +0100 +++ piuparts-0.62/debian/changelog 2015-01-06 10:36:47.000000000 +0100 @@ -1,3 +1,10 @@ +piuparts (0.62) unstable; urgency=medium + + * Default to http://http.debian.net/debian instead of the deprecated + http://cdn.debian.net service as default mirror. (Closes: #774471) + + -- Holger Levsen <holger@debian.org> Tue, 06 Jan 2015 10:36:39 +0100 + piuparts (0.61) unstable; urgency=medium [ Michael Prokop ] diff -Nru piuparts-0.61/piuparts.1.txt piuparts-0.62/piuparts.1.txt --- piuparts-0.61/piuparts.1.txt 2014-11-17 02:13:21.000000000 +0100 +++ piuparts-0.62/piuparts.1.txt 2015-01-06 10:33:01.000000000 +0100 @@ -146,7 +146,7 @@ Display messages from loglevel LEVEL, possible values are: error, info, dump, debug. The default is dump. *-m* 'url', *--mirror*='url':: - Which Debian mirror to use. The default is the first mirror named in _/etc/apt/sources.list_ or _http://cdn.debian.net/debian_ if none is found. This option may be used multiple times to use multiple mirrors. Only the first mirror is used with *debootstrap*. + Which Debian mirror to use. The default is the first mirror named in _/etc/apt/sources.list_ or _http://http.debian.net/debian_ if none is found. This option may be used multiple times to use multiple mirrors. Only the first mirror is used with *debootstrap*. + The 'components' that are used for a mirror can also be set with this option: a space separated list within the same argument (so you need to quote the entire argument in the shell). If no components are given explicitly, the usual Debian components are used (main, contrib, and non-free). For the mirrors read from _/etc/apt/sources.list_, the components are read from the same place. + diff -Nru piuparts-0.61/piupartslib/conf.py piuparts-0.62/piupartslib/conf.py --- piuparts-0.61/piupartslib/conf.py 2014-05-01 00:25:32.000000000 +0200 +++ piuparts-0.62/piupartslib/conf.py 2015-01-06 10:33:01.000000000 +0100 @@ -72,7 +72,7 @@ def get_mirror(self, distro=None): if self["mirror"] is not None: return self["mirror"] - return "http://cdn.debian.net/debian" + return "http://http.debian.net/debian" def get_distros(self): if self["upgrade-test-distros"] is not None: diff -Nru piuparts-0.61/piuparts.py piuparts-0.62/piuparts.py --- piuparts-0.61/piuparts.py 2014-12-03 14:09:11.000000000 +0100 +++ piuparts-0.62/piuparts.py 2015-01-06 10:33:01.000000000 +0100 @@ -93,7 +93,7 @@ return ["main", "contrib", "non-free"] def get_mirror(self): - return [("http://cdn.debian.net/debian", self.get_components())] + return [("http://http.debian.net/debian", self.get_components())] def get_distribution(self): return [distro_info.DebianDistroInfo().devel()] diff -Nru piuparts-0.61/README_server.txt piuparts-0.62/README_server.txt --- piuparts-0.61/README_server.txt 2014-11-17 02:13:21.000000000 +0100 +++ piuparts-0.62/README_server.txt 2015-01-06 10:33:01.000000000 +0100 @@ -394,7 +394,7 @@ * "mirror" tells the slave which mirror it is to use. The slave gives this to piuparts when it runs it. The URLs for Packages and Sources files will be generated from this setting, too. Default - (for fetching Packages/Sources): "http://cdn.debian.net/debian". + (for fetching Packages/Sources): "http://http.debian.net/debian". * "distro" is the distribution the slave should tell piuparts to use for basic install/purge testing. It is also possible to use a diff -Nru piuparts-0.61/tests/test_piuparts.py piuparts-0.62/tests/test_piuparts.py --- piuparts-0.61/tests/test_piuparts.py 2014-10-26 20:17:52.000000000 +0100 +++ piuparts-0.62/tests/test_piuparts.py 2015-01-06 10:33:01.000000000 +0100 @@ -27,7 +27,7 @@ self.assertEqual(defaults.get_keyring(), '/usr/share/keyrings/debian- archive-keyring.gpg') self.assertEqual(defaults.get_components(), ["main", "contrib", "non- free"]) - self.assertEqual(defaults.get_mirror(), [("http://cdn.debian.net/debian", ["main", "contrib", "non-free"])]) + self.assertEqual(defaults.get_mirror(), [("http://http.debian.net/debian", ["main", "contrib", "non-free"])]) self.assertEqual(defaults.get_distribution(), ['sid']) def test_new_defaults_return_ubuntu_defaults(self): The package has been uploaded and accepted to sid (as briefly agreed with Nils last night on #-qa.) Thanks for your work on jessie! cheers, Holger
Attachment:
signature.asc
Description: This is a digitally signed message part.