[Piuparts-commits] [SCM] piuparts git repository branch, bikeshed, updated. 0.53-24-g933d4fd

[Holger Levsen]

The following commit has been merged in the bikeshed branch:
commit 933d4fd88ab4e72070087c271156e6554abc0e96
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Jul 19 13:35:57 2013 +0200

    deal with incompatible-licenses detected by adequate
    
    piuparts.py and piuparts-reports.py: add incompatible-licenses (detected since adequate 0.7) to inadequate_tags and known_problems.

diff --git a/debian/changelog b/debian/changelog
index 5e6ddeb..0184bd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ piuparts (0.54) UNRELEASED; urgency=low
   * piuparts-master: recommend apache2 | httpd.
   * README_server.txt: be more verbose about configuring sudo.
     (Closes: #711155)
+  * piuparts.py and piuparts-reports.py: add incompatible-licenses (detected
+    since adequate 0.7) to inadequate_tags and known_problems.
 
   [ David Steele ]
   * pupartslib/packagesdb.py
diff --git a/known_problems/incompatible_licenses_inadequate_issue.conf b/known_problems/incompatible_licenses_inadequate_issue.conf
new file mode 100644
index 0000000..6e1e70b
--- /dev/null
+++ b/known_problems/incompatible_licenses_inadequate_issue.conf
@@ -0,0 +1,11 @@
+#
+# detect packages with some inadequate tag from adequate
+#
+PATTERN='(FAIL|WARN): Running adequate resulted in .*incompatible-licenses'
+WHERE='pass fail bugged affected'
+ISSUE=1
+HEADER="Packages tagged 'incompatible-licenses' by adequate"
+HELPTEXT="
+<p>Running <a href="http://packages.debian.org/adequate" target="_blank">adequate</a> resulted in the package being tagged 'incompatible-licenses' which indicates a bug.
+</p>
+"
diff --git a/piuparts-report.py b/piuparts-report.py
index c9ef132..871e8eb 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -387,6 +387,7 @@ linktarget_by_template = [
     ("boring_broken_symlink_file_inadequate_issue.tpl", "...and logfile contains tag from adequate 'broken-symlink-file'"),
     ("bin_or_sbin_binary_requires_usr_lib_library_inadequate_issue.tpl", "but adequate tagged it 'bin-or-sbin-binary-requires-usr-lib-library'"),
     ("library_not_found_inadequate_issue.tpl", "but adequate tagged it 'library-not-found'"),
+    ("incompatible_licenses_inadequate_issue.tpl", "but adequate tagged it 'incompatible-licenses'"),
     ("py_file_not_bytecompiled_inadequate_issue.tpl", "but adequate tagged it 'py-file-not-bytecompiled'"),
     ("pyshared_file_not_bytecompiled_inadequate_issue.tpl", "but adequate tagged it 'pyshared-file-not-bytecompiled'"),
     ("undefined_symbol_inadequate_issue.tpl", "but adequate tagged it 'undefined-symbol'"),
diff --git a/piuparts.py b/piuparts.py
index 22e3a44..f0663b0 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1258,7 +1258,8 @@ class Chroot:
                                 'library-not-found',
                                 'py-file-not-bytecompiled',
                                 'pyshared-file-not-bytecompiled',
-                                'undefined-symbol' ]
+                                'undefined-symbol',
+                                'incompatible-licenses' ]
             boring_tags = [ 'obsolete-conffile',
                             'missing-copyright-file',
                             'broken-symlink' ]

-- 
piuparts git repository