[Piuparts-commits] [piuparts] 01/02: Default to http://http.debian.net/debian instead of the deprecated http://cdn.debian.net service as default mirror. (Closes: #774471)

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository piuparts.

commit 6b2f7780b5d316f750ef316a4b83c7d5e46cbe88
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Jan 6 10:36:36 2015 +0100

    Default to http://http.debian.net/debian instead of the deprecated http://cdn.debian.net service as default mirror. (Closes: #774471)
---
 README_server.txt         | 2 +-
 conf/piuparts.conf.sample | 2 +-
 debian/changelog          | 7 +++++++
 piuparts.1.txt            | 2 +-
 piuparts.py               | 2 +-
 piupartslib/conf.py       | 2 +-
 tests/test_piuparts.py    | 2 +-
 7 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/README_server.txt b/README_server.txt
index a5e70bc..abb9cff 100644
--- a/README_server.txt
+++ b/README_server.txt
@@ -394,7 +394,7 @@ section, too, and will serve as defaults for all other sections
 * "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 --git a/conf/piuparts.conf.sample b/conf/piuparts.conf.sample
index c77784a..9e100a6 100644
--- a/conf/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -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 --git a/debian/changelog b/debian/changelog
index b6701b2..fba7a9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+piuparts (0.62) UNRELEASED; 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 at debian.org>  Tue, 06 Jan 2015 10:34:17 +0100
+
 piuparts (0.61) unstable; urgency=medium
 
   [ Michael Prokop ]
diff --git a/piuparts.1.txt b/piuparts.1.txt
index b0094f8..6634fc4 100644
--- a/piuparts.1.txt
+++ b/piuparts.1.txt
@@ -146,7 +146,7 @@ The tarball can be created with the '-s' option, or you can use one that *pbuild
   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 --git a/piuparts.py b/piuparts.py
index 0450cf0..fdaa742 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -93,7 +93,7 @@ class DebianDefaults(Defaults):
         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 --git a/piupartslib/conf.py b/piupartslib/conf.py
index 28a5d70..def54f1 100644
--- a/piupartslib/conf.py
+++ b/piupartslib/conf.py
@@ -72,7 +72,7 @@ class Config(UserDict.UserDict):
     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 --git a/tests/test_piuparts.py b/tests/test_piuparts.py
index ff1ba7c..45e3d60 100644
--- a/tests/test_piuparts.py
+++ b/tests/test_piuparts.py
@@ -27,7 +27,7 @@ class DefaultsFactoryTests(unittest.TestCase):
 
         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):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git