[Piuparts-commits] [piuparts] 01/02: add support for adequate tag ldd-failure

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 8b0e4ecaa3d6d2771f261b1504ecb8a59368e4ba
Author: Andreas Beckmann <anbe at debian.org>
Date:   Fri Oct 16 14:22:08 2015 +0200

    add support for adequate tag ldd-failure
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 debian/changelog                         | 1 +
 known_problems/ldd_inadequate_issue.conf | 6 +++---
 piuparts-report.py                       | 2 +-
 piuparts.py                              | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 063a222..825c018 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ piuparts (0.67) UNRELEASED; urgency=medium
   * piuparts.py:
     - Ensure /etc/mtab exists in the chroot.
     - Record and compare file owner and group names instead of uid/gid.
+  * Add support for adequate tag ldd-failure.
   * scripts/post_distupgrade_exceptions:
     - Fix the /etc/nsswitch.conf wheezy -> jessie upgrade handling.
   * Update custom scripts handling databases.
diff --git a/known_problems/ldd_inadequate_issue.conf b/known_problems/ldd_inadequate_issue.conf
index 0e2a822..32dd0b6 100644
--- a/known_problems/ldd_inadequate_issue.conf
+++ b/known_problems/ldd_inadequate_issue.conf
@@ -1,11 +1,11 @@
 #
 # detect packages with some inadequate tag from adequate
 #
-PATTERN='(FAIL|WARN): Running adequate resulted in .* ldd'
+PATTERN='(FAIL|WARN): Running adequate resulted in .* ldd-failure'
 WHERE='pass fail bugged affected'
 ISSUE=1
-HEADER="Packages tagged 'ldd' by adequate"
+HEADER="Packages tagged 'ldd-failure' by adequate"
 HELPTEXT="
-<p>Running <a href="https://packages.debian.org/adequate" target="_blank">adequate</a> resulted in the package being tagged 'ldd' which indicates a bug.
+<p>Running <a href="https://packages.debian.org/adequate" target="_blank">adequate</a> resulted in the package being tagged 'ldd-failure' which indicates a bug.
 </p>
 "
diff --git a/piuparts-report.py b/piuparts-report.py
index b1483a1..1f041b9 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -434,7 +434,7 @@ linktarget_by_template = [
     ("program_name_collision_inadequate_issue.tpl", "but adequate found a program name collision"),
     ("py_file_not_bytecompiled_inadequate_issue.tpl", "but adequate found a .py file that is not byte-compiled"),
     ("pyshared_file_not_bytecompiled_inadequate_issue.tpl", "but adequate found a .py file in /usr/share/pyshared that is not byte-compiled"),
-    ("ldd_inadequate_issue.tpl", "but adequate encountered unexpected ldd warnings"),
+    ("ldd_inadequate_issue.tpl", "but adequate failed to run ldd on a binary or library"),
     ("library_not_found_inadequate_issue.tpl", "but adequate couldn't find a required library"),
     ("undefined_symbol_inadequate_issue.tpl", "but adequate found an undefined symbol"),
     ("symbol-size-mismatch_inadequate_issue.tpl", "but adequate found that a symbol has changed size since the package was built"),
diff --git a/piuparts.py b/piuparts.py
index dcfb8c9..d0cc432 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1260,7 +1260,7 @@ class Chroot:
                     'broken-binfmt-detector',
                     'broken-binfmt-interpreter',
                     'incompatible-licenses',
-                    'ldd',
+                    'ldd-failure',
                     'library-not-found',
                     'missing-alternative',
                     'missing-copyright-file',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git