[Piuparts-commits] rev 856 - trunk
Holger Levsen
holger at alioth.debian.org
Fri Dec 31 14:46:01 UTC 2010
Author: holger
Date: 2010-12-31 14:46:00 +0000 (Fri, 31 Dec 2010)
New Revision: 856
Modified:
trunk/piuparts-slave.py
Log:
revert to r849
Modified: trunk/piuparts-slave.py
===================================================================
--- trunk/piuparts-slave.py 2010-12-31 14:25:11 UTC (rev 855)
+++ trunk/piuparts-slave.py 2010-12-31 14:46:00 UTC (rev 856)
@@ -70,7 +70,7 @@
"log-file": "piuparts-master.log",
"mirror": None,
"piuparts-cmd": "sudo piuparts",
- "distro": None,
+ "distro": "sid",
"chroot-tgz": None,
"upgrade-test-distros": None,
"upgrade-test-chroot-tgz": None,
@@ -283,16 +283,15 @@
if self._slave.get_reserved():
packages_files = {}
- distros = ""
- if self._config["distro"]:
- distros = [self._config["distro"]]
if self._config["upgrade-test-distros"]:
- distros += " " + self._config["upgrade-test-distros"]
+ distros = [self._config["distro"]] + self._config["upgrade-test-distros"].split()
+ else:
+ distros = [self._config["distro"]]
for distro in distros:
if distro not in packages_files:
packages_files[distro] = fetch_packages_file(self._config, distro)
- packages_file = packages_files[distro]
+ packages_file = packages_files[self._config["distro"]]
for package_name, version in self._slave.get_reserved():
if package_name in packages_file:
More information about the Piuparts-commits
mailing list