[Piuparts-commits] rev 836 - in trunk: . debian

[Holger Levsen]

Author: holger
Date: 2010-12-27 11:43:43 +0000 (Mon, 27 Dec 2010)
New Revision: 836

Modified:
   trunk/debian/changelog
   trunk/piuparts-slave.py
Log:
bugfix: support mirror configuration option also for upgrade-tests.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-12-19 13:50:23 UTC (rev 835)
+++ trunk/debian/changelog	2010-12-27 11:43:43 UTC (rev 836)
@@ -36,6 +36,7 @@
     - fix crash when going into sleep when idle. 
     - add support for only doing upgrade tests (without the basic test in the
       upgrade target distro).
+    - bugfix: support mirror configuration option also for upgrade-tests.
   * piuparts.py: 
     - new option: --log-level to specify the verbosity of piuparts
       output. Thanks to Fabrice Coutadeur for the patch! (Closes: #567190)

Modified: trunk/piuparts-slave.py
===================================================================
--- trunk/piuparts-slave.py	2010-12-19 13:50:23 UTC (rev 835)
+++ trunk/piuparts-slave.py	2010-12-27 11:43:43 UTC (rev 836)
@@ -367,8 +367,13 @@
         distros = ["-d " + distro.strip() for distro in distros]
         distros = " ".join(distros)
         command = "%(piuparts-cmd)s -ab %(upgrade-test-chroot-tgz)s " % config
-        command += distros + " " + package["Package"]
+        command += distros
 
+        if config["mirror"]:
+          command += "--mirror %s " % config["mirror"]
+
+        command += " " + package["Package"]
+
         logging.debug("Executing: %s" % command)
         output.write("\nExecuting: %s\n" % command)
         f = os.popen("{ %s; } 2>&1" % command, "r")