[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.2.10-50-g36e3dc2



The following commit has been merged in the master branch:
commit 5d87f12217ea78eb061c3fffc50f81810e6d9da1
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Tue May 19 21:08:42 2009 +0100

    Don't include empty alternatives in lists of required dependencies
    
    * checks/scripts:
      + [ADB] Do not include an empty alternative in the list of suggested
        dependencies for an interpreter when the interpreter may be
        unversioned but the dependency may not.  For example, pikeX.Y provide
        /usr/bin/pike and /usr/bin/pikeX.Y but there is no "pike" package.

diff --git a/checks/scripts b/checks/scripts
index e226854..c91fb44 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -481,7 +481,8 @@ for my $filename (sort keys %{$info->scripts}) {
 	    $d =~ s/\$1/$_/g;
 	    $d;
 	} @versions;
-	my $depends = join (' | ', $data->[1], @depends);
+	unshift (@depends, $data->[1]) if length $data->[1];
+	my $depends = join (' | ',  @depends);
 	unless ($all_parsed->implies($depends)) {
 	    if ($base eq 'php') {
 		tag('php-script-but-no-phpX-cli-dep', $filename);
diff --git a/debian/changelog b/debian/changelog
index ca725e2..2ab9547 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,11 @@ lintian (2.2.11) UNRELEASED; urgency=low
     + [RA] Explain in the symlink-contains-spurious-segments description
       that these segments can cause problems in the presence of symlinked
       directories.
+  * checks/scripts:
+    + [ADB] Do not include an empty alternative in the list of suggested
+      dependencies for an interpreter when the interpreter may be
+      unversioned but the dependency may not.  For example, pikeX.Y provide
+      /usr/bin/pike and /usr/bin/pikeX.Y but there is no "pike" package.
 
   * data/debhelper/{dh_commands,dh_packages,maint_commands}:
     + [ADB] Refresh against unstable.
diff --git a/t/tests/basic-non-native-with-epoch/upstream/README b/t/tests/scripts-interpreters/debian/README
similarity index 100%
copy from t/tests/basic-non-native-with-epoch/upstream/README
copy to t/tests/scripts-interpreters/debian/README
diff --git a/t/tests/scripts-interpreters/debian/debian/install b/t/tests/scripts-interpreters/debian/debian/install
new file mode 100644
index 0000000..c86edc9
--- /dev/null
+++ b/t/tests/scripts-interpreters/debian/debian/install
@@ -0,0 +1,2 @@
+unversioned-pike	usr/bin/
+versioned-pike		usr/bin/
diff --git a/t/tests/scripts-interpreters/debian/debian/links b/t/tests/scripts-interpreters/debian/debian/links
new file mode 100644
index 0000000..c02a1ea
--- /dev/null
+++ b/t/tests/scripts-interpreters/debian/debian/links
@@ -0,0 +1,2 @@
+usr/share/man/man1/interpreters.1	usr/share/man/man1/unversioned-pike.1
+usr/share/man/man1/interpreters.1	usr/share/man/man1/versioned-pike.1
diff --git a/t/tests/scripts-interpreters/debian/debian/manpages b/t/tests/scripts-interpreters/debian/debian/manpages
new file mode 100644
index 0000000..74d51b8
--- /dev/null
+++ b/t/tests/scripts-interpreters/debian/debian/manpages
@@ -0,0 +1 @@
+interpreters.1
diff --git a/t/tests/scripts-interpreters/debian/interpreters.1 b/t/tests/scripts-interpreters/debian/interpreters.1
new file mode 100644
index 0000000..9e6dd89
--- /dev/null
+++ b/t/tests/scripts-interpreters/debian/interpreters.1
@@ -0,0 +1,5 @@
+.TH interpreters 1 "Debian Utilities" "DEBIAN" \" -*- nroff -*-
+.SH NAME
+interpreters \- test script
+
+Dummy manpage to avoid triggering warnings about it not existing.
diff --git a/t/tests/scripts-interpreters/debian/unversioned-pike b/t/tests/scripts-interpreters/debian/unversioned-pike
new file mode 100644
index 0000000..f1eaf01
--- /dev/null
+++ b/t/tests/scripts-interpreters/debian/unversioned-pike
@@ -0,0 +1,4 @@
+#! /usr/bin/pike
+
+This is not a real pike script but sufficient to trigger a warning that the package 
+is missing a dependency for the interpreter.
diff --git a/t/tests/scripts-interpreters/debian/versioned-pike b/t/tests/scripts-interpreters/debian/versioned-pike
new file mode 100644
index 0000000..6b3b65b
--- /dev/null
+++ b/t/tests/scripts-interpreters/debian/versioned-pike
@@ -0,0 +1,4 @@
+#! /usr/bin/pike7.6
+
+This is not a real pike script but sufficient to trigger a warning that the package 
+is missing a dependency for the interpreter.
diff --git a/t/tests/scripts-interpreters/desc b/t/tests/scripts-interpreters/desc
new file mode 100644
index 0000000..7c920b7
--- /dev/null
+++ b/t/tests/scripts-interpreters/desc
@@ -0,0 +1,5 @@
+Testname: scripts-interpreters
+Sequence: 6000
+Version: 1.0
+Description: Ensure package dependencies provide interpreters used by scripts
+Test-For: missing-dep-for-interpreter
diff --git a/t/tests/scripts-interpreters/tags b/t/tests/scripts-interpreters/tags
new file mode 100644
index 0000000..03c091b
--- /dev/null
+++ b/t/tests/scripts-interpreters/tags
@@ -0,0 +1,2 @@
+E: scripts-interpreters: missing-dep-for-interpreter pike => pike7.6 | pike7.6-core (./usr/bin/unversioned-pike)
+E: scripts-interpreters: missing-dep-for-interpreter pike7.6 => pike7.6 | pike7.6-core (./usr/bin/versioned-pike)

-- 
Debian package checker


Reply to: