[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.51

Andreas Beckmann anbe at debian.org
Wed May 15 10:09:45 UTC 2013


The following commit has been merged in the master branch:
commit fe20d48204001ec9be6ae06acb0cc6a0f1cd9b4e
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Apr 7 15:16:08 2013 +0200

    p-r: gracefully handle missing sections
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/debian/changelog b/debian/changelog
index dc6714c..69ba842 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ piuparts (0.51) UNRELEASED; urgency=low
     - Skip sections that don't exist in piuparts.conf and continue to run.
   * piuparts-analyze.py:
   * piuparts-report.py:
+    - Skip sections that don't exist in piuparts.conf.
   * Makefile:
   * detect_well_known_errors:
     - Skip sections that don't exist in piuparts.conf.
diff --git a/piuparts-report.py b/piuparts-report.py
index 3c0552c..c43e4a6 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -43,6 +43,7 @@ except:
   pass
 
 import piupartslib
+from piupartslib.conf import MissingSection
 
 
 CONFIG_FILE = "/etc/piuparts/piuparts.conf"
@@ -1353,7 +1354,11 @@ def main():
     if os.path.exists(master_directory):
         packagedb_cache = {}
         for section_name in section_names:
+          try:
             section = Section(section_name, master_directory, doc_root, packagedb_cache=packagedb_cache)
+          except MissingSection as e:
+            logging.error("Configuration Error in section '%s': %s" % (section_name, e))
+          else:
             section.generate_output(output_directory=output_directory, section_names=section_names)
 
         # static pages

-- 
piuparts git repository



More information about the Piuparts-commits mailing list