[Piuparts-commits] [piuparts] 01/01: Replace httpredir.debian.org with deb.debian.org everywhere: with deb.d.o apt will use SRV records to go directly to the mirror, with httpredir.d.o there will be http redirects for every file.

Sat Mar 11 01:01:19 UTC 2017

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

holger pushed a commit to branch develop
in repository piuparts.

commit 221f0ee69c01f14d368b30dfdc6e176323793044
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Mar 11 02:01:04 2017 +0100

    Replace httpredir.debian.org with deb.debian.org everywhere: with deb.d.o apt will use SRV records to go directly to the mirror, with httpredir.d.o there will be http redirects for every file.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 README_server.txt         | 2 +-
 conf/distros.conf         | 4 ++--
 conf/piuparts.conf.sample | 2 +-
 debian/changelog          | 3 +++
 piuparts.1.txt            | 2 +-
 piuparts.py               | 2 +-
 piupartslib/conf.py       | 2 +-
 tests/test_piuparts.py    | 2 +-
 8 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/README_server.txt b/README_server.txt
index 323d1a1..ab983e7 100644
--- a/README_server.txt
+++ b/README_server.txt
@@ -400,7 +400,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://httpredir.debian.org/debian".
+ (for fetching Packages/Sources): "http://deb.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/distros.conf b/conf/distros.conf
index c6e9a5e..7bce4a2 100644
--- a/conf/distros.conf
+++ b/conf/distros.conf
@@ -109,7 +109,7 @@ depends = stretch
 depends = stretch
 
 [stretch-debug]
-uri = http://httpredir.debian.org/debian-debug
+uri = http://deb.debian.org/debian-debug
 depends = stretch
 
 [stretch-proposed]
@@ -123,7 +123,7 @@ target-release = stretch-backports
 
 
 [sid-debug]
-uri = http://httpredir.debian.org/debian-debug
+uri = http://deb.debian.org/debian-debug
 depends = sid
 
 
diff --git a/conf/piuparts.conf.sample b/conf/piuparts.conf.sample
index ed3cba7..a9eda3d 100644
--- a/conf/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -8,7 +8,7 @@
 
 [global]
 sections = sid
-mirror = http://httpredir.debian.org/debian
+mirror = http://deb.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 ca0eaba..0967380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,9 @@ piuparts (0.76) UNRELEASED; urgency=medium
   * Add python (>= 2.7) to the depends of piuparts-master and piuparts-slave
     as dh-python has been changed to only add python depends if it finds
     python code in PATH. Thanks lintian.
+  * Replace httpredir.debian.org with deb.debian.org everywhere: with deb.d.o
+    apt will use SRV records to go directly to the mirror, with httpredir.d.o
+    there will be http redirects for every file.
   * slave_run: Fix bug which prevented a different number of slaves to be
     started than defined in the configuration. Also add a check to ensure that
     this optional argument is an integer and within the defined maximum number
diff --git a/piuparts.1.txt b/piuparts.1.txt
index 279881c..ada24d5 100644
--- a/piuparts.1.txt
+++ b/piuparts.1.txt
@@ -162,7 +162,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://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*.
+  Which Debian mirror to use. The default is the first mirror named in _/etc/apt/sources.list_ or _http://deb.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 3b4ba76..ee919ab 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -99,7 +99,7 @@ class DebianDefaults(Defaults):
         return ["main", "contrib", "non-free"]
 
     def get_mirror(self):
-        return [("http://httpredir.debian.org/debian", self.get_components())]
+        return [("http://deb.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 5801191..5338ee0 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://httpredir.debian.org/debian"
+        return "http://deb.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 4daba5c..f62e35b 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://httpredir.debian.org/debian", ["main", "contrib", "non-free"])])
+        self.assertEqual(defaults.get_mirror(), [("http://deb.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

