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

jwilk pushed a commit to branch master
in repository lintian.

commit b7c5315c9f0fc77db8a3f79bf44fddf7bd8d0596
Author: Jakub Wilk <jw...@debian.org>
Date:   Sun Oct 16 21:42:21 2016 +0200

    checks/watch-file: Recognize pgpmode options
---
 checks/watch-file.pm                                             | 2 ++
 debian/changelog                                                 | 4 ++++
 .../debian/debian/upstream/signing-key.asc                       | 1 +
 t/tests/watch-file-pgpmode-next/debian/debian/watch              | 5 +++++
 t/tests/watch-file-pgpmode-next/desc                             | 8 ++++++++
 t/tests/watch-file-pgpmode-next/tags                             | 0
 t/tests/watch-file-pgpmode-none/debian/debian/watch              | 3 +++
 t/tests/watch-file-pgpmode-none/desc                             | 9 +++++++++
 t/tests/watch-file-pgpmode-none/tags                             | 1 +
 9 files changed, 33 insertions(+)

diff --git a/checks/watch-file.pm b/checks/watch-file.pm
index b007cec..53016aa 100644
--- a/checks/watch-file.pm
+++ b/checks/watch-file.pm
@@ -116,6 +116,8 @@ sub run {
                       and /^uversionmangle\s*=.*$prerelease/;
                     $withgpgverification = 1
                       if /^pgpsigurlmangle\s*=\s*/;
+                    $withgpgverification = 1
+                      if /^pgpmode\s*=\s*(?!none\s*$)\S.*$/;
                 }
             }
             if (m%qa\.debian\.org/watch/sf\.php\?%) {
diff --git a/debian/changelog b/debian/changelog
index 4fce0cf..0b015cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ lintian (2.5.49) UNRELEASED; urgency=medium
   * checks/init.d.pm:
     + [JW] Don't require version constraint for lsb-base dependencies.
       The needed version has been available for many stable releases.
+  * checks/watch-file.pm:
+    + [JW] Assume that watch files containing the pgpmode option (different
+      than "none") verify upstream signature.  Thanks to Robert Luberda for
+      the bug report.  (Closes: #841000)
 
   * data/cruft/non-distributable-files:
     + [BR] Add some rapidjson files.
diff --git 
a/t/tests/watch-file-pgpmode-next/debian/debian/upstream/signing-key.asc 
b/t/tests/watch-file-pgpmode-next/debian/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..bd03c4e
--- /dev/null
+++ b/t/tests/watch-file-pgpmode-next/debian/debian/upstream/signing-key.asc
@@ -0,0 +1 @@
+Too lazy to fake this file
diff --git a/t/tests/watch-file-pgpmode-next/debian/debian/watch 
b/t/tests/watch-file-pgpmode-next/debian/debian/watch
new file mode 100644
index 0000000..97c3019
--- /dev/null
+++ b/t/tests/watch-file-pgpmode-next/debian/debian/watch
@@ -0,0 +1,5 @@
+version=4
+opts="pgpmode=next" http://alioth.debian.org/frs/?group_id=30928 \
+  (?:.*)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian
+opts="pgpmode=previous" http://alioth.debian.org/frs/?group_id=30928 \
+  (?:.*)/@PACKAGE@@ANY_VERSION@@SIGNATURE_EXT@ previous
diff --git a/t/tests/watch-file-pgpmode-next/desc 
b/t/tests/watch-file-pgpmode-next/desc
new file mode 100644
index 0000000..ed22086
--- /dev/null
+++ b/t/tests/watch-file-pgpmode-next/desc
@@ -0,0 +1,8 @@
+Testname: watch-file-pgpmode-next
+Type: non-native
+Version: 2.0-1
+Options: --pedantic
+Skeleton: pedantic
+Description: Watch file with pgpmode=next
+Test-Against: debian-watch-may-check-gpg-signature
+References: #841000
diff --git a/t/tests/watch-file-pgpmode-next/tags 
b/t/tests/watch-file-pgpmode-next/tags
new file mode 100644
index 0000000..e69de29
diff --git a/t/tests/watch-file-pgpmode-none/debian/debian/watch 
b/t/tests/watch-file-pgpmode-none/debian/debian/watch
new file mode 100644
index 0000000..eb84757
--- /dev/null
+++ b/t/tests/watch-file-pgpmode-none/debian/debian/watch
@@ -0,0 +1,3 @@
+version=4
+opts="pgpmode=none" http://alioth.debian.org/frs/?group_id=30928 \
+  (?:.*)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian
diff --git a/t/tests/watch-file-pgpmode-none/desc 
b/t/tests/watch-file-pgpmode-none/desc
new file mode 100644
index 0000000..8e01336
--- /dev/null
+++ b/t/tests/watch-file-pgpmode-none/desc
@@ -0,0 +1,9 @@
+Testname: watch-file-pgpmode-none
+Type: non-native
+Version: 2.0-1
+Options: --pedantic
+Skeleton: pedantic
+Description: Watch file with pgpmode=none
+Test-For: debian-watch-may-check-gpg-signature
+Test-Against: debian-watch-file-pubkey-file-is-missing
+References: #841000
diff --git a/t/tests/watch-file-pgpmode-none/tags 
b/t/tests/watch-file-pgpmode-none/tags
new file mode 100644
index 0000000..f66435b
--- /dev/null
+++ b/t/tests/watch-file-pgpmode-none/tags
@@ -0,0 +1 @@
+P: watch-file-pgpmode-none source: debian-watch-may-check-gpg-signature

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

Reply via email to