[Piuparts-commits] rev 857 - trunk

[Holger Levsen]

Author: holger
Date: 2011-01-02 13:43:40 +0000 (Sun, 02 Jan 2011)
New Revision: 857

Modified:
   trunk/piuparts-slave.py
Log:
another attempt to fix 'add support for only doing upgrade tests'

Modified: trunk/piuparts-slave.py
===================================================================
--- trunk/piuparts-slave.py	2010-12-31 14:46:00 UTC (rev 856)
+++ trunk/piuparts-slave.py	2011-01-02 13:43:40 UTC (rev 857)
@@ -70,7 +70,7 @@
                 "log-file": "piuparts-master.log",
                 "mirror": None,
                 "piuparts-cmd": "sudo piuparts",
-                "distro": "sid",
+                "distro": None,
                 "chroot-tgz": None,
                 "upgrade-test-distros": None,
                 "upgrade-test-chroot-tgz": None,
@@ -232,6 +232,9 @@
         oldcwd = os.getcwd()
         os.chdir(self._slave_directory)
 
+        if self._config["chroot-tgz"] and not self._config["distro"]:
+          logging.info("The option --chroot-tgz needs --distro.")
+
         if self._config["chroot-tgz"] and not os.path.exists(self._config["chroot-tgz"]):
             create_chroot(self._config, self._config["chroot-tgz"], self._config["distro"])
 
@@ -283,15 +286,21 @@
 
         if self._slave.get_reserved():
             packages_files = {}
-            if self._config["upgrade-test-distros"]:
-                distros = [self._config["distro"]] + self._config["upgrade-test-distros"].split()
+            if self._config["distro"]:
+                distros = [self._config["distro"]]
             else:
-                distros = [self._config["distro"]]
+                distros = []
 
+            if self._config["upgrade-test-distros"]:
+                distros += self._config["upgrade-test-distros"].split()
+
             for distro in distros:
                 if distro not in packages_files:
                     packages_files[distro] = fetch_packages_file(self._config, distro)
-            packages_file = packages_files[self._config["distro"]]
+            if self._config["distro"]:
+              packages_file = packages_files[self._config["distro"]]
+            else:
+              packages_file = packages_files[distro]
 
             for package_name, version in self._slave.get_reserved():
                 if package_name in packages_file: