From 8ac2c330590fa0ee2d502cc618501e17f0c7258e Mon Sep 17 00:00:00 2001 From: Mike Miller Date: Sat, 22 Aug 2015 11:51:04 -0400 Subject: [PATCH] mk-sbuild, pull-debian-{debdiff,source}: Use httpredir.debian.org as the default mirror for Debian. --- debian/changelog | 4 ++++ mk-sbuild | 2 +- pull-debian-debdiff | 2 +- ubuntutools/config.py | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25d4c4c..b2db450 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,10 @@ ubuntu-dev-tools (0.155) UNRELEASED; urgency=medium [ Adam Conrad ] * Allow requestsync/syncpackage to work with either codename or alias. + [ Mike Miller ] + * mk-sbuild, pull-debian-{debdiff,source}: Use httpredir.debian.org as the + default mirror for Debian. + -- Dimitri John Ledkov Mon, 19 Jan 2015 14:15:32 +0000 ubuntu-dev-tools (0.154) experimental; urgency=medium diff --git a/mk-sbuild b/mk-sbuild index cfbc411..184ac9d 100755 --- a/mk-sbuild +++ b/mk-sbuild @@ -491,7 +491,7 @@ ubuntu) ;; debian) if [ -z "$DEBOOTSTRAP_MIRROR" ]; then - DEBOOTSTRAP_MIRROR="http://ftp.debian.org/debian" + DEBOOTSTRAP_MIRROR="http://httpredir.debian.org/debian" fi if [ -z "$COMPONENTS" ]; then COMPONENTS="main non-free contrib" diff --git a/pull-debian-debdiff b/pull-debian-debdiff index 1b03180..e96cfa5 100755 --- a/pull-debian-debdiff +++ b/pull-debian-debdiff @@ -52,7 +52,7 @@ def main(): parser.add_option('-d', '--debian-mirror', metavar='DEBIAN_MIRROR', dest='debian_mirror', help='Preferred Debian mirror ' - '(default: http://ftp.debian.org/debian)') + '(default: http://httpredir.debian.org/debian)') parser.add_option('-s', '--debsec-mirror', metavar='DEBSEC_MIRROR', dest='debsec_mirror', help='Preferred Debian Security mirror ' diff --git a/ubuntutools/config.py b/ubuntutools/config.py index f047ae4..fb52065 100644 --- a/ubuntutools/config.py +++ b/ubuntutools/config.py @@ -34,7 +34,7 @@ class UDTConfig(object): # These are reqired to be used by at least two scripts. defaults = { 'BUILDER': 'pbuilder', - 'DEBIAN_MIRROR': 'http://ftp.debian.org/debian', + 'DEBIAN_MIRROR': 'http://httpredir.debian.org/debian', 'DEBSEC_MIRROR': 'http://security.debian.org', 'LPINSTANCE': 'production', 'MIRROR_FALLBACK': True,