[Piuparts-commits] [piuparts] 13/17: known_problems: upgrade 'missing-copyright-file' from boring

Holger Levsen holger at alioth.debian.org
Wed Nov 6 09:45:54 UTC 2013


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

holger pushed a commit to branch develop
in repository piuparts.

commit 9d95f3d9877771749823093f67a3ca7e2c461ae3
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Nov 6 00:05:31 2013 +0100

    known_problems: upgrade 'missing-copyright-file' from boring
    
    and make it a normal issue found by adequate, and let
    pre_remove_50_find_missing_copyright no longer generate a fatal error
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 custom-scripts/scripts/pre_remove_50_find_missing_copyright  |    2 --
 debian/changelog                                             |    3 +++
 .../boring_missing_copyright_file_inadequate_issue.conf      |   10 ----------
 known_problems/missing_copyright_file_inadequate_issue.conf  |   10 ++++++++++
 piuparts-report.py                                           |    2 +-
 piuparts.py                                                  |    2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/custom-scripts/scripts/pre_remove_50_find_missing_copyright b/custom-scripts/scripts/pre_remove_50_find_missing_copyright
index 9a76af8..e4e5a53 100755
--- a/custom-scripts/scripts/pre_remove_50_find_missing_copyright
+++ b/custom-scripts/scripts/pre_remove_50_find_missing_copyright
@@ -41,5 +41,3 @@ do
 		ls -la "$docdir/" || true
 	fi
 done
-
-test -z "$failed" || exit 1
diff --git a/debian/changelog b/debian/changelog
index c7b065f..4bdbfbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ piuparts (0.56) UNRELEASED; urgency=low
   * piuparts-report.py:
     - Report URLs of all Packages files used for a section.
     - Avoid reporting duplicate dependencies after stripping versioning.
+  * known_problems: Upgrade adequate issue 'missing-copyright-file' from
+    boring to normal and make pre_remove_50_find_missing_copyright no longer
+    generate fatal errors.
 
  -- Andreas Beckmann <anbe at debian.org>  Tue, 22 Oct 2013 22:16:21 +0200
 
diff --git a/known_problems/boring_missing_copyright_file_inadequate_issue.conf b/known_problems/boring_missing_copyright_file_inadequate_issue.conf
deleted file mode 100644
index 9c1ba00..0000000
--- a/known_problems/boring_missing_copyright_file_inadequate_issue.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# detect packages which have the string "Running adequate resulted in less interesting tags found" in their logs
-#
-PATTERN='(FAIL|WARN): Running adequate resulted in less interesting tags found: .* missing-copyright-file'
-WHERE='pass fail bugged affected'
-ISSUE=1
-HEADER="Packages tagged 'missing-copyright-file' by adequate"
-HELPTEXT="
-<p>Some issues detected by <a href="http://packages.debian.org/adequate" target="_blank">adequate</a> are also detected by piuparts, 'missing-copyright-file' is one of them.
-"
diff --git a/known_problems/missing_copyright_file_inadequate_issue.conf b/known_problems/missing_copyright_file_inadequate_issue.conf
new file mode 100644
index 0000000..088ee4c
--- /dev/null
+++ b/known_problems/missing_copyright_file_inadequate_issue.conf
@@ -0,0 +1,10 @@
+#
+# detect packages with some inadequate tag from adequate
+#
+PATTERN='(FAIL|WARN): Running adequate resulted in .*missing-copyright-file|MISSING COPYRIGHT FILE'
+WHERE='pass fail bugged affected'
+ISSUE=1
+HEADER="Packages tagged 'missing-copyright-file' by adequate"
+HELPTEXT="
+<p>Running <a href="http://packages.debian.org/adequate" target="_blank">adequate</a> resulted in the package being tagged 'missing-copyright-file' which indicates a bug.
+"
diff --git a/piuparts-report.py b/piuparts-report.py
index 16f86f9..4798664 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -389,13 +389,13 @@ linktarget_by_template = [
     ("installs_over_symlink_issue.tpl", "but package installs something over existing symlinks"),
     ("broken_symlinks_issue.tpl", "but logfile contains 'broken symlinks'"),
     ("unknown_inadequate_issue.tpl", "but logfile contains unknown inadequate issues"),
-    ("boring_missing_copyright_file_inadequate_issue.tpl", "...and logfile contains tag from adequate 'missing-copyright-file'"),
     ("boring_obsolete_conffile_file_inadequate_issue.tpl", "...and logfile contains tag from adequate 'obsolete-conffile-file'"),
     ("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'"),
     ("ldd_inadequate_issue.tpl", "but adequate tagged it 'ldd'"),
     ("incompatible_licenses_inadequate_issue.tpl", "but adequate tagged it 'incompatible-licenses'"),
+    ("missing_copyright_file_inadequate_issue.tpl", "but adequate tagged it 'missing-copyright-file'"),
     ("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 8c90fb0..7b489ec 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1268,6 +1268,7 @@ class Chroot:
             adequate_tags = [
                     'bin-or-sbin-binary-requires-usr-lib-library',
                     'library-not-found',
+                    'missing-copyright-file',
                     'py-file-not-bytecompiled',
                     'pyshared-file-not-bytecompiled',
                     'undefined-symbol',
@@ -1276,7 +1277,6 @@ class Chroot:
                     ]
             boring_tags = [
                     'obsolete-conffile',
-                    'missing-copyright-file',
                     'broken-symlink',
                     ]
             ignored_tags = [ ]

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



More information about the Piuparts-commits mailing list