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

[Holger Levsen]

Author: holger
Date: 2010-12-31 14:15:10 +0000 (Fri, 31 Dec 2010)
New Revision: 853

Modified:
   trunk/debian/changelog
   trunk/piuparts-slave.py
Log:
this is all part of 'add support for only doing upgrade tests'

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-12-31 13:58:53 UTC (rev 852)
+++ trunk/debian/changelog	2010-12-31 14:15:10 UTC (rev 853)
@@ -40,9 +40,6 @@
     - also do upgrade tests if the version of a package being tested (the one 
       in the upgraded distro) is not available in the distro being upgraded 
       from.
-    - don't use the packages file from the default distro (sid) for 
-      upgrade-tests if no distro is given, rather use the last one of the tested
-      distros (ie. squeeze in the current setup on piatti.d.o)
     - make configuration setting "distro" to not default to any distro.
   * piuparts.py: 
     - new option: --log-level to specify the verbosity of piuparts

Modified: trunk/piuparts-slave.py
===================================================================
--- trunk/piuparts-slave.py	2010-12-31 13:58:53 UTC (rev 852)
+++ trunk/piuparts-slave.py	2010-12-31 14:15:10 UTC (rev 853)
@@ -283,20 +283,15 @@
 
         if self._slave.get_reserved():
             packages_files = {}
-            if self._config["upgrade-test-distros"]:
-                distros = [self._config["distro"]] + self._config["upgrade-test-distros"].split()
-            else:
+            if self._config["distro"]:
                 distros = [self._config["distro"]]
+            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)
-            # don't use the packages_file from the default distro (sid) for upgrade-tests
-            # if no distro is given, rather use the last one of the tested distros
-            if self._config["upgrade-test-distros"] and self._config["distro"] is not None:
-              packages_file = packages_files[distro]
-            else:
-              packages_file = packages_files[self._config["distro"]]
+            packages_file = packages_files[distro]
 
             for package_name, version in self._slave.get_reserved():
                 if package_name in packages_file: