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

[Holger Levsen]

Author: holger
Date: 2010-12-31 12:39:57 +0000 (Fri, 31 Dec 2010)
New Revision: 850

Modified:
   trunk/debian/changelog
   trunk/piuparts-slave.py
Log:
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)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-12-31 12:37:34 UTC (rev 849)
+++ trunk/debian/changelog	2010-12-31 12:39:57 UTC (rev 850)
@@ -40,6 +40,9 @@
     - 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)
   * 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-31 12:37:34 UTC (rev 849)
+++ trunk/piuparts-slave.py	2010-12-31 12:39:57 UTC (rev 850)
@@ -291,7 +291,12 @@
             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"]]
+            # 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 not self._config["distro"]:
+              packages_file = packages_files[distro]
+            else:
+              packages_file = packages_files[self._config["distro"]]
 
             for package_name, version in self._slave.get_reserved():
                 if package_name in packages_file: