[Piuparts-commits] [SCM] piuparts git repository branch, bikeshed, updated. 0.52-58-g1992169

[Holger Levsen]

The following commit has been merged in the bikeshed branch:
commit 6884237b2b2251803e646532512ae605bf300578
Author: Andrew Starr-Bochicchio <a.starr.b at gmail.com>
Date:   Thu May 30 13:57:44 2013 -0400

    When distro defaults are explicitly specified, use the distro default mirrors (Closes: #710347).

diff --git a/debian/changelog b/debian/changelog
index 7c4d5bb..74a7924 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,6 +68,8 @@ piuparts (0.53) UNRELEASED; urgency=low
   [ Andrew Starr-Bochicchio ]
   * piuparts.py:
     - Move default keyring to distro defaults.  (Closes: #710346)
+    - When distro defaults are explicitly specified, use the distro default
+      mirrors (Closes: #710347).
 
  -- Andreas Beckmann <anbe at debian.org>  Mon, 27 May 2013 18:24:27 +0200
 
diff --git a/piuparts.py b/piuparts.py
index c42778b..50dc36b 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -2939,7 +2939,10 @@ def parse_command_line():
         settings.debian_distros = defaults.get_distribution()
 
     if not settings.debian_mirrors:
-        settings.debian_mirrors = find_default_debian_mirrors()
+        if opts.defaults:
+            settings.debian_mirrors = defaults.get_mirror()
+        else:
+            settings.debian_mirrors = find_default_debian_mirrors()
         if not settings.debian_mirrors:
             settings.debian_mirrors = defaults.get_mirror()
 

-- 
piuparts git repository