[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.51-39-g4559ce8

[Holger Levsen]

The following commit has been merged in the develop branch:
commit 4559ce853cb533e69c9092ef863f5e404afb33f4
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu May 23 16:39:04 2013 +0200

    Workaround #709372 and ignore broken symlinks found by adequate.

diff --git a/debian/changelog b/debian/changelog
index 7258dbe..1893553 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ piuparts (0.52) UNRELEASED; urgency=low
   * piuparts.py:
     - Run adequate (if installed) after installation test. New options
       --no-adequate and --fail-if-inadequate. (Closes: #703902)
+    - Workaround #709372 and ignore broken symlinks found by adequate.
     - Do not print a "Guessed: debian" line on every run. It's the default
       anyway. (Closes: #703058)
   * piuparts-report: 
diff --git a/piuparts.py b/piuparts.py
index 3e3c711..8e4f251 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1238,6 +1238,8 @@ class Chroot:
     def check_adequate(self, packages):
         if settings.adequate and os.path.isfile('/usr/bin/adequate'):
             (status, output) = run(["adequate", "--root", self.name] + packages, ignore_errors=True)
+            # ignore broken-symlinks - workaround #709372 in adequate
+            output = re.compile('^[^:]+: broken-symlink .*\n', re.MULTILINE).sub('', output)
             if output:
                 if settings.warn_if_inadequate:
                     logging.error("WARN: inadequate results from running adequate:\n%s" %

-- 
piuparts git repository