[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.42-69-g1159ca6

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit 20d57f11558e6b5ebf058d294813e3832248d4cc
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Mon Apr 16 19:46:06 2012 +0200

    slave: skip misconfigured sections
    
    skip sections with neither 'distro' nor 'upgrade-test-distros' config
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index 59f0ad9..472ae43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ piuparts (0.44) UNRELEASED; urgency=low
     - Sections wait before retry 15 minutes after error and one hour if idle.
     - Create idle.stamp files to remember idle sections for one hour and
       notify concurrent slaves about idle state.
+    - Skip misconfigured sections that have neither 'distro' nor
+      'upgrade-test-distros' in their config.  (Closes: #668863)
   * piuparts-report.py:
     - Add link to the list of untestable logs.
     - Add more known problem reports: forgotten alternatives, warnings in
diff --git a/piuparts-slave.py b/piuparts-slave.py
index fee4acf..ce2f9c2 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -384,6 +384,11 @@ class Section:
         if self._config["upgrade-test-distros"]:
             distros += self._config["upgrade-test-distros"].split()
 
+        if not distros:
+            logging.error("neither 'distro' nor 'upgrade-test-distros' configured")
+            self._sleep_until = time.time() + 3600
+            return 0
+
         packages_files = {}
         for distro in distros:
             if distro not in packages_files:

-- 
piuparts git repository