[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 590d74a398b11d2c8c69e709f06aa42195b905ca
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sun Apr 15 18:38:12 2012 +0200

    slave: skip section with failed Packages file
    
    do not abort if a Packages file cannot be fetched
    skip section and retry after 15 minutes
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index d6a7bb5..59f0ad9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ piuparts (0.44) UNRELEASED; urgency=low
     - Do not leak the logfile file descriptor to piuparts.
     - Skip disabled sections (max-reserved = 0).
     - Do not abort if connection to master failed, just skip the section.
+    - Do not abort if Packages file cannot be fetched, just skip the section.
     - Implement simple section locking to allow concurrent slave instances.
     - 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
diff --git a/piuparts-slave.py b/piuparts-slave.py
index 0829531..fee4acf 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -387,7 +387,12 @@ class Section:
         packages_files = {}
         for distro in distros:
             if distro not in packages_files:
-                packages_files[distro] = fetch_packages_file(self._config, distro)
+                try:
+                    packages_files[distro] = fetch_packages_file(self._config, distro)
+                except IOError:
+                    logging.error("failed to fetch packages file for %s" % distro)
+                    self._sleep_until = time.time() + 900
+                    return 0
         if self._config["distro"]:
             packages_file = packages_files[self._config["distro"]]
         else:

-- 
piuparts git repository