[Piuparts-commits] [piuparts] 01/01: Use httpredir.debian.org instead of http.debian.net. (Closes: #783617)

[Holger Levsen]

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

holger pushed a commit to branch develop
in repository piuparts.

commit d866977ba28af4f411d471d8592354b53e699cf4
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Jun 12 12:15:01 2015 +0200

    Use httpredir.debian.org instead of http.debian.net. (Closes: #783617)
---
 README_server.txt         | 2 +-
 conf/piuparts.conf.sample | 2 +-
 debian/changelog          | 1 +
 piuparts.1.txt            | 2 +-
 piuparts.py               | 2 +-
 piupartslib/conf.py       | 2 +-
 tests/test_piuparts.py    | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README_server.txt b/README_server.txt
index 230b582..506d514 100644
--- a/README_server.txt
+++ b/README_server.txt
@@ -399,7 +399,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://http.debian.net/debian".
+ (for fetching Packages/Sources): "http://httpredir.debian.org/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 9e100a6..ed3cba7 100644
--- a/conf/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -8,7 +8,7 @@
 
 [global]
 sections = sid
-mirror = http://http.debian.net/debian
+mirror = http://httpredir.debian.org/debian
 master-host = localhost
 master-user = piupartsm
 piuparts-command = sudo piuparts --scriptsdir /etc/piuparts/scripts
diff --git a/debian/changelog b/debian/changelog
index b26fe38..c73a288 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ piuparts (0.64) UNRELEASED; urgency=medium
   [ Holger Levsen ]
   * Add FancyIndexing to piuparts-master.conf and enable apache syntax
     highlighting in vim. (Thanks DSA!)
+  * Use httpredir.debian.org instead of http.debian.net. (Closes: #783617)
 
   [ Andreas Beckmann ]
   * piuparts.py:
diff --git a/piuparts.1.txt b/piuparts.1.txt
index 1d5515d..9294289 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://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*.
+  Which Debian mirror to use. The default is the first mirror named in _/etc/apt/sources.list_ or _http://httpredir.debian.org/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 fe4f6bd..7ba8662 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -94,7 +94,7 @@ class DebianDefaults(Defaults):
         return ["main", "contrib", "non-free"]
 
     def get_mirror(self):
-        return [("http://http.debian.net/debian", self.get_components())]
+        return [("http://httpredir.debian.org/debian", self.get_components())]
 
     def get_distribution(self):
         return [distro_info.DebianDistroInfo().devel()]
diff --git a/piupartslib/conf.py b/piupartslib/conf.py
index e06be68..5801191 100644
--- a/piupartslib/conf.py
+++ b/piupartslib/conf.py
@@ -73,7 +73,7 @@ class Config(UserDict.UserDict):
     def get_mirror(self, distro=None):
         if self["mirror"] is not None:
             return self["mirror"]
-        return "http://http.debian.net/debian"
+        return "http://httpredir.debian.org/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 45e3d60..4daba5c 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://http.debian.net/debian", ["main", "contrib", "non-free"])])
+        self.assertEqual(defaults.get_mirror(), [("http://httpredir.debian.org/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