[Piuparts-commits] rev 253 - piatti/org/piuparts.debian.org/etc trunk

[Holger Levsen]

Author: holger
Date: 2009-03-16 03:04:16 +0000 (Mon, 16 Mar 2009)
New Revision: 253

Modified:
   piatti/org/piuparts.debian.org/etc/piuparts-slave.conf
   trunk/piuparts-slave.py
Log:
fix syntax errors

Modified: piatti/org/piuparts.debian.org/etc/piuparts-slave.conf
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts-slave.conf	2009-03-16 02:46:56 UTC (rev 252)
+++ piatti/org/piuparts.debian.org/etc/piuparts-slave.conf	2009-03-16 03:04:16 UTC (rev 253)
@@ -6,6 +6,9 @@
 
 [slave]
 sections = sid squeeze lenny2squeeze 
+master-host = localhost
+master-user = piupartsm
+master-command = echo hello
 
 [sid]
 idle-sleep = 300

Modified: trunk/piuparts-slave.py
===================================================================
--- trunk/piuparts-slave.py	2009-03-16 02:46:56 UTC (rev 252)
+++ trunk/piuparts-slave.py	2009-03-16 03:04:16 UTC (rev 253)
@@ -273,30 +273,29 @@
         if not self._slave.get_reserved():
             logging.debug("Nothing to do, sleeping for a bit")
             time.sleep(int(self._config["idle-sleep"]))
-            continue
+        else:
+            packages_files = {}
+            distros = [self._config["distro"]] + 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"]]
 
-        packages_files = {}
-        distros = [self._config["distro"]] + 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"]]
-
-        for package_name, version in self._slave.get_reserved():
-            if package_name in packages_file:
-                package = packages_file[package_name]
-                if version == package["Version"]:
-                    test_package(self._config, package, packages_files)
+            for package_name, version in self._slave.get_reserved():
+                if package_name in packages_file:
+                    package = packages_file[package_name]
+                    if version == package["Version"]:
+                        test_package(self._config, package, packages_files)
+                    else:
+                        create_file(os.path.join("untestable", 
+                                    log_name(package_name, version)),
+                                    "%s %s not found" % (package_name, version))
                 else:
                     create_file(os.path.join("untestable", 
-                                             log_name(package_name, version)),
-                                "%s %s not found" % (package_name, version))
-            else:
-                create_file(os.path.join("untestable", 
-                                         log_name(package_name, version)),
-                            "Package %s not found" % package_name)
-            self._slave.forget_reserved(package_name, version)
-        os.chdir(oldcwd)
+                                log_name(package_name, version)),
+                                "Package %s not found" % package_name)
+                self._slave.forget_reserved(package_name, version)
+            os.chdir(oldcwd)
 
 
 def log_name(package, version):
@@ -418,7 +417,7 @@
     if len(sys.argv) > 1:
         section_names = sys.argv[1:]
     else:
-        slave_config = Config(section="slave"))
+        slave_config = Config(section="slave")
         slave_config.read(CONFIG_FILE)
         section_names = slave_config["sections"].split()