[lintian] 01/01: Split out checks for debconf-config-not-executable into a separate test protected by a Test-Requires now that dpkg >= 1.19.0 will bail out on that condition.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit 9ff507b15247335a2c1fade661cdb010193c9765
Author: Chris Lamb <lamby@debian.org>
Date: Tue Oct 17 15:44:22 2017 -0400
Split out checks for debconf-config-not-executable into a separate test protected by a Test-Requires now that dpkg >= 1.19.0 will bail out on that condition.
---
debian/changelog | 4 ++++
t/tests/debconf-config-general/desc | 1 -
t/tests/debconf-config-general/tags | 2 --
.../debconf-config-not-executable/debian/debian/config | 5 +++++
.../debian/debian/control.in | 15 +++++++++++++++
.../debian/debian/rules | 0
t/tests/debconf-config-not-executable/desc | 7 +++++++
t/tests/debconf-config-not-executable/tags | 4 ++++
t/tests/legacy-maintainer-scripts/debian/debian/rules | 2 +-
t/tests/legacy-maintainer-scripts/desc | 1 -
t/tests/legacy-maintainer-scripts/tags | 2 --
11 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2dcfe51..7efc144 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,10 @@ lintian (2.5.56) UNRELEASED; urgency=medium
* t/scripts/pod-synopsis.t:
+ [CL] Apply patch from Ville Skyttä <ville.skytta@iki.fi> to skip all
POD synopsis tests if Test::Pod is not available. (Closes: #878522)
+ * t/tests/debconf-config-*, t/tests/legacy-maintainer-scripts:
+ + [CL] Split out checks for debconf-config-not-executable into a
+ separate test protected by a Test-Requires now that dpkg >= 1.19.0
+ will bail out on that condition.
-- Chris Lamb <lamby@debian.org> Thu, 12 Oct 2017 14:08:44 -0400
diff --git a/t/tests/debconf-config-general/desc b/t/tests/debconf-config-general/desc
index a2b8db2..eb8e271 100644
--- a/t/tests/debconf-config-general/desc
+++ b/t/tests/debconf-config-general/desc
@@ -3,7 +3,6 @@ Version: 1.0
Description: Test for various debconf config issues
Test-For:
config-does-not-load-confmodule
- debconf-config-not-executable
isdefault-flag-is-deprecated
possible-debconf-note-abuse
unknown-debconf-priority
diff --git a/t/tests/debconf-config-general/tags b/t/tests/debconf-config-general/tags
index 7f0df94..7f00d60 100644
--- a/t/tests/debconf-config-general/tags
+++ b/t/tests/debconf-config-general/tags
@@ -1,5 +1,3 @@
-E: debconf-config-general: control-file-has-bad-permissions config 0644 != 0755
-E: debconf-config-general: debconf-config-not-executable
E: debconf-config-general: unknown-debconf-priority config:13 unknown
W: debconf-config-general: config-does-not-load-confmodule
W: debconf-config-general: isdefault-flag-is-deprecated config
diff --git a/t/tests/debconf-config-not-executable/debian/debian/config b/t/tests/debconf-config-not-executable/debian/debian/config
new file mode 100644
index 0000000..d429f9b
--- /dev/null
+++ b/t/tests/debconf-config-not-executable/debian/debian/config
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
diff --git a/t/tests/debconf-config-not-executable/debian/debian/control.in b/t/tests/debconf-config-not-executable/debian/debian/control.in
new file mode 100644
index 0000000..3af5796
--- /dev/null
+++ b/t/tests/debconf-config-not-executable/debian/debian/control.in
@@ -0,0 +1,15 @@
+Source: {$source}
+Priority: optional
+Section: {$section}
+Maintainer: {$author}
+Standards-Version: {$standards_version}
+Build-Depends: {$build_depends}
+
+Package: {$source}
+Architecture: {$architecture}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: {$description}
+ This is a test package designed to exercise some feature or tag of
+ Lintian. It is part of the Lintian test suite and may do very odd
+ things. It should not be installed like a regular package. It may
+ be an empty package.
diff --git a/t/tests/debconf-config-general/debian/debian/rules b/t/tests/debconf-config-not-executable/debian/debian/rules
old mode 100644
new mode 100755
similarity index 100%
rename from t/tests/debconf-config-general/debian/debian/rules
rename to t/tests/debconf-config-not-executable/debian/debian/rules
diff --git a/t/tests/debconf-config-not-executable/desc b/t/tests/debconf-config-not-executable/desc
new file mode 100644
index 0000000..142b399
--- /dev/null
+++ b/t/tests/debconf-config-not-executable/desc
@@ -0,0 +1,7 @@
+Testname: debconf-config-not-executable
+Version: 1.0
+Description: Test for debian/config not being executable
+# dpkg 1.19.0 will error out due to https://anonscm.debian.org/git/dpkg/dpkg.git/commit/?id=cd791ccf8117398ea765eda3a92db52a9cf04c23
+Test-Depends: dpkg (<< 1.19.0)
+Test-For:
+ debconf-config-not-executable
diff --git a/t/tests/debconf-config-not-executable/tags b/t/tests/debconf-config-not-executable/tags
new file mode 100644
index 0000000..969c6dd
--- /dev/null
+++ b/t/tests/debconf-config-not-executable/tags
@@ -0,0 +1,4 @@
+E: debconf-config-not-executable: control-file-has-bad-permissions config 0644 != 0755
+E: debconf-config-not-executable: debconf-config-not-executable
+W: debconf-config-not-executable: no-debconf-templates
+W: debconf-config-not-executable: postinst-does-not-load-confmodule
diff --git a/t/tests/legacy-maintainer-scripts/debian/debian/rules b/t/tests/legacy-maintainer-scripts/debian/debian/rules
index 633aa30..de4161e 100755
--- a/t/tests/legacy-maintainer-scripts/debian/debian/rules
+++ b/t/tests/legacy-maintainer-scripts/debian/debian/rules
@@ -10,7 +10,7 @@ binary-arch:
binary-indep:
install -d debian/tmp/DEBIAN
- install -m 0644 debian/config debian/tmp/DEBIAN
+ install -m 0755 debian/config debian/tmp/DEBIAN
install -m 0755 debian/preinst debian/tmp/DEBIAN
install -m 0755 debian/postinst debian/tmp/DEBIAN
install -m 0755 debian/prerm debian/tmp/DEBIAN
diff --git a/t/tests/legacy-maintainer-scripts/desc b/t/tests/legacy-maintainer-scripts/desc
index a1548d5..8e6d242 100644
--- a/t/tests/legacy-maintainer-scripts/desc
+++ b/t/tests/legacy-maintainer-scripts/desc
@@ -9,7 +9,6 @@ Test-For:
command-with-path-in-maintainer-script
config-does-not-load-confmodule
control-file-has-bad-permissions
- debconf-config-not-executable
debhelper-but-no-misc-depends
debian-changelog-file-contains-invalid-email-address
debian-rules-missing-good-practice-target-dfsg
diff --git a/t/tests/legacy-maintainer-scripts/tags b/t/tests/legacy-maintainer-scripts/tags
index c8bcbc4..ec9aaa0 100644
--- a/t/tests/legacy-maintainer-scripts/tags
+++ b/t/tests/legacy-maintainer-scripts/tags
@@ -1,8 +1,6 @@
E: maintainer-scripts source: malformed-dm-upload-allowed Yes
E: maintainer-scripts source: orphaned-package-should-not-have-uploaders
E: maintainer-scripts source: wrong-debian-qa-group-name QA group <packages@qa.debian.org>
-E: maintainer-scripts: control-file-has-bad-permissions config 0644 != 0755
-E: maintainer-scripts: debconf-config-not-executable
E: maintainer-scripts: debian-changelog-file-contains-invalid-email-address jeroen@mordor
E: maintainer-scripts: forbidden-config-interpreter #!/usr/bin/python
E: maintainer-scripts: init.d-script-not-included-in-package etc/init.d/foo
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: