[SCM] Debian package checker branch, master, updated. 2.5.0-rc2-122-g12888e8
The following commit has been merged in the master branch:
commit c7fd2146ac19823919775cf70e0a3ea097b03a4f
Author: Niels Thykier <niels@thykier.net>
Date: Tue Jan 18 00:21:57 2011 +0100
Removed the / prefix from filenames emitted by the etcfiles check
diff --git a/checks/etcfiles b/checks/etcfiles
index 9a734b1..d7e0c55 100644
--- a/checks/etcfiles
+++ b/checks/etcfiles
@@ -55,7 +55,7 @@ foreach my $file (@{$info->sorted_index}) {
and $file ne 'etc/init.d/skeleton'
and $file ne 'etc/init.d/rc'
and $file ne 'etc/init.d/rcS') {
- tag "file-in-etc-not-marked-as-conffile", "/$file";
+ tag "file-in-etc-not-marked-as-conffile", "$file";
}
}
diff --git a/t/tests/etcfiles-etc-not-marked/tags b/t/tests/etcfiles-etc-not-marked/tags
index 172788d..22d97ce 100644
--- a/t/tests/etcfiles-etc-not-marked/tags
+++ b/t/tests/etcfiles-etc-not-marked/tags
@@ -1 +1 @@
-E: etcfiles-etc-not-marked: file-in-etc-not-marked-as-conffile /etc/something.conf
+E: etcfiles-etc-not-marked: file-in-etc-not-marked-as-conffile etc/something.conf
diff --git a/testset/tags.etcfiles b/testset/tags.etcfiles
index 1a77b2d..1a4325b 100644
--- a/testset/tags.etcfiles
+++ b/testset/tags.etcfiles
@@ -1,8 +1,8 @@
E: etcfiles source: debian-rules-missing-required-target binary-arch
E: etcfiles source: not-binnmuable-all-depends-any only-etcfiles -> etcfiles
E: etcfiles: changelog-file-not-compressed changelog
-E: etcfiles: file-in-etc-not-marked-as-conffile /etc/improper
-E: etcfiles: file-in-etc-not-marked-as-conffile /etc/improper-link
+E: etcfiles: file-in-etc-not-marked-as-conffile etc/improper
+E: etcfiles: file-in-etc-not-marked-as-conffile etc/improper-link
E: etcfiles: malformed-md5sums-control-file line 7
E: etcfiles: md5sum-mismatch etc/improper
E: etcfiles: md5sums-lists-nonexisting-file usr/bin/foo
diff --git a/testset/tags.filenames b/testset/tags.filenames
index 7a23d67..9df0968 100644
--- a/testset/tags.filenames
+++ b/testset/tags.filenames
@@ -7,7 +7,7 @@ E: filenames: dir-or-file-in-opt opt/foo/bar
E: filenames: dir-or-file-in-srv srv/foo/
E: filenames: dir-or-file-in-srv srv/foo/bar
E: filenames: dir-or-file-in-var-www var/www/foo
-E: filenames: file-in-etc-not-marked-as-conffile /etc/gconf/schemas/test.schema
+E: filenames: file-in-etc-not-marked-as-conffile etc/gconf/schemas/test.schema
E: filenames: lengthy-symlink usr/lib/filenames/symlink4wrong ../filenames/symlink2
E: filenames: lengthy-symlink usr/share/doc/filenames/version.txt.gz ../filenames/doc/version6.txt.gz
E: filenames: no-copyright-file
--
Debian package checker
Reply to: