[SCM] Debian package checker branch, master, updated. 2.2.9-49-gd848434

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit 202a0e014cba9a44690aced7da31b3e10d499119
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Mon Apr 13 01:29:57 2009 -0500

    Fix a duplicate-conffile false negative
    
    Fixed a false negative duplicate-conffile in the new test case caused by
    checks/conffiles not normalising relative to non-relative paths before adding
    it to the index used to detect duplicates.

diff --git a/checks/conffiles b/checks/conffiles
index 6e5e2e4..456c041 100644
--- a/checks/conffiles
+++ b/checks/conffiles
@@ -42,22 +42,25 @@ while (<IN>) {
     chop;
     next if m/^\s*$/;
 
+    unless (m,^/,) {
+	tag "relative-conffile", $_;
+	$_ = '/' . $_;
+    }
+
     $conffiles{$_}++;
+
     if ($conffiles{$_} > 1) {
 	tag "duplicate-conffile", $_;
     }
 
-    if (m,^/?usr/,) {
+    if (m,^/usr/,) {
 	tag "file-in-usr-marked-as-conffile", $_;
     } else {
-	unless (m,^/?etc/,) {
+	unless (m,^/etc/,) {
 	    tag "non-etc-file-marked-as-conffile", $_;
 	}
     }
 
-    unless (m,^/,) {
-	tag "relative-conffile", $_;
-    }
 }
 close(IN);
 
diff --git a/t/tests/conffiles-general/debian/debian/conffiles b/t/tests/conffiles-general/debian/debian/conffiles
new file mode 100644
index 0000000..c011be9
--- /dev/null
+++ b/t/tests/conffiles-general/debian/debian/conffiles
@@ -0,0 +1,4 @@
+/etc/foo
+/usr/share/foo
+/var/cache/foo
+etc/foo
diff --git a/t/tests/conffiles-general/debian/debian/rules b/t/tests/conffiles-general/debian/debian/rules
new file mode 100755
index 0000000..484bf2d
--- /dev/null
+++ b/t/tests/conffiles-general/debian/debian/rules
@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+pkg=conffiles-general
+
+%:
+	dh $@
+binary:
+	dh --before dh_builddeb binary
+	dpkg-deb --nocheck --build debian/$(pkg) ../$(pkg)_1.0_all.deb
+	dh --after dh_builddeb binary
diff --git a/t/tests/conffiles-general/desc b/t/tests/conffiles-general/desc
new file mode 100644
index 0000000..aa3b27c
--- /dev/null
+++ b/t/tests/conffiles-general/desc
@@ -0,0 +1,9 @@
+Testname: conffiles-general
+Sequence: 6000
+Version: 1.0
+Description: Test for conffile-related checks
+Test-For:
+    file-in-usr-marked-as-conffile
+    non-etc-file-marked-as-conffile
+    relative-conffile
+    duplicate-conffile
diff --git a/t/tests/conffiles-general/tags b/t/tests/conffiles-general/tags
new file mode 100644
index 0000000..9f7dc60
--- /dev/null
+++ b/t/tests/conffiles-general/tags
@@ -0,0 +1,4 @@
+E: conffiles-general: duplicate-conffile /etc/foo
+E: conffiles-general: file-in-usr-marked-as-conffile /usr/share/foo
+E: conffiles-general: non-etc-file-marked-as-conffile /var/cache/foo
+E: conffiles-general: relative-conffile etc/foo

-- 
Debian package checker