[Piuparts-commits] rev 840 - trunk

[Holger Levsen]

Author: holger
Date: 2010-12-28 01:10:28 +0000 (Tue, 28 Dec 2010)
New Revision: 840

Modified:
   trunk/piuparts-slave.py
Log:
bugfix for r836 'bugfix: support mirror configuration option also for upgrade-tests.' and cleanup

Modified: trunk/piuparts-slave.py
===================================================================
--- trunk/piuparts-slave.py	2010-12-28 00:28:46 UTC (rev 839)
+++ trunk/piuparts-slave.py	2010-12-28 01:10:28 UTC (rev 840)
@@ -342,14 +342,14 @@
    
     # omit distro test if chroot-tgz is not specified.
     if config["chroot-tgz"]: 
-      command = "%(piuparts-cmd)s -ad %(distro)s -b %(chroot-tgz)s " % \
+      command = "%(piuparts-cmd)s -ad %(distro)s -b %(chroot-tgz)s" % \
                   config
       if config["keep-sources-list"] in ["yes", "true"]:
-          command += "--keep-sources-list "
+          command += " --keep-sources-list "
     
       if config["mirror"]:
-          command += "--mirror %s " % config["mirror"]
-      command += package["Package"]
+          command += " --mirror %s " % config["mirror"]
+      command += " " + package["Package"]
 
       logging.debug("Executing: %s" % command)
       output.write("Executing: %s\n" % command)
@@ -370,7 +370,7 @@
         command += distros
 
         if config["mirror"]:
-          command += "--mirror %s " % config["mirror"]
+          command += " --mirror %s " % config["mirror"]
 
         command += " " + package["Package"]