The following commit has been merged in the master branch:
commit 691911b362587836b7c87b71857a32e7849752fd
Author: Niels Thykier <[email protected]>
Date: Sat Jun 25 22:24:57 2011 +0200
Fixed test failured related to the extended symlink check
Also ignore the /usr/share/doc/$pkg symlinks; the copyright-file
check already handles this.
diff --git a/checks/symlinks b/checks/symlinks
index de86648..17e4229 100644
--- a/checks/symlinks
+++ b/checks/symlinks
@@ -48,8 +48,12 @@ foreach my $file (@{$info->sorted_index}) {
my $path; # the target (from the pkg root)
# Should not happen (too often) - but just in case
next unless $target;
+ # Skip usr/share/doc/<pkg> - we got a separate check for
+ # that.
+ next if $file eq "usr/share/doc/$pkg";
$path = resolve_pkg_path(dirname($file), $target);
- next if $path eq ''; # skip links to "/"
+ # skip unresolvable links and links to "/"
+ next if $path eq '' or $path eq '.';
# Check if the destination is in the package itself
next if $index->{$path} || $index->{"$path/"};
diff --git a/t/tests/changelog-file-symlink/tags
b/t/tests/changelog-file-symlink/tags
index 8d2fee2..0e66cb2 100644
--- a/t/tests/changelog-file-symlink/tags
+++ b/t/tests/changelog-file-symlink/tags
@@ -1 +1,2 @@
W: changelog-file-symlink: debian-changelog-file-is-a-symlink
+X: changelog-file-symlink: package-contains-broken-symlink
usr/share/doc/changelog-file-symlink/changelog.gz ../lintian/changelog.gz
diff --git a/t/tests/init.d-script-registration/tags
b/t/tests/init.d-script-registration/tags
index 5e4d5fd..43efd8f 100644
--- a/t/tests/init.d-script-registration/tags
+++ b/t/tests/init.d-script-registration/tags
@@ -1,3 +1,4 @@
W: init.d-script-registration: init.d-script-missing-lsb-section
etc/init.d/foo.in
W: init.d-script-registration:
script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/bar
W: init.d-script-registration:
script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/foo.in
+X: init.d-script-registration: package-contains-broken-symlink etc/init.d/bar
foo
diff --git a/t/tests/shared-libs-la-files/tags
b/t/tests/shared-libs-la-files/tags
index 65c14f8..2c0ec2b 100644
--- a/t/tests/shared-libs-la-files/tags
+++ b/t/tests/shared-libs-la-files/tags
@@ -1,2 +1,3 @@
E: shared-libs-la-files: incorrect-libdir-in-la-file
usr/lib/kde3/kio_locate.la
/build/buildd/kio-locate-0.4.5+ds/debian/kio-locate/usr/lib/kde3 !=
/usr/lib/kde3
E: shared-libs-la-files: non-empty-dependency_libs-in-la-file
usr/lib/dependency_libs.la
+X: shared-libs-la-files: package-contains-broken-symlink var/lib/kde3/foo.la
kio_locate.la
diff --git a/testset/tags.binary b/testset/tags.binary
index 5089ad1..5e31b21 100644
--- a/testset/tags.binary
+++ b/testset/tags.binary
@@ -138,4 +138,5 @@ W: binary: unquoted-string-in-menu-item usr/lib/menu/binary
needs:2
W: binary: unquoted-string-in-menu-item usr/share/menu/binary needs:1
W: binary: unquoted-string-in-menu-item usr/share/menu/binary needs:2
X: binary: duplicate-files usr/share/doc/binary/html/ch1.html
usr/share/doc/binary/html/ch5.html usr/share/doc/binary/html/index.html
-X: binary: package-contains-broken-symlink usr/share/doc/binary/html/ch3.html
/usr/share/doc/binary/htm/ch1.html
+X: binary: package-contains-broken-symlink usr/share/doc/binary/html/ch2.html
../html/./ch1.html
+X: binary: package-contains-broken-symlink usr/share/doc/binary/html/ch3.html
usr/share/doc/binary/htm/ch1.html
diff --git a/testset/tags.filenames b/testset/tags.filenames
index 68d07c0..c00837a 100644
--- a/testset/tags.filenames
+++ b/testset/tags.filenames
@@ -146,5 +146,17 @@ W: more-filename-games: binary-without-manpage
usr/games/yet-another-test-game
W: more-filename-games: package-section-games-but-has-usr-bin
X: filenames: duplicate-files usr/share/doc/filenames/.DS_Store
usr/share/doc/filenames/._NEWS.Debian usr/share/doc/filenames/Thumbs.db
usr/share/doc/filenames/link-one
X: filenames: duplicate-files usr/share/doc/filenames/NEWS.Debian
usr/share/doc/filenames/README.macosx
usr/share/doc/filenames/examples/__init__.py
usr/share/doc/filenames/examples/very_interesting_example
-X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink2ok
/etc/symlink
-X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink3wrong
/usr/lib/filenames/symlink2
+X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink1ok
../../share/symlink
+X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink1wrong
../../../etc/symlink
+X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink2ok
etc/symlink
+X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink3ok test
+X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink3wrong
usr/lib/filenames/symlink2
+X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink4ok
../menu/somethingelse
+X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink4wrong
../filenames/symlink2
+X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink5wrong
../menu/../somethingelse
+X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink6wrong
./file4
+X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink7wrong
../menu/./something
+X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink8wrong
../menu//something
+X: filenames: package-contains-broken-symlink usr/lib/filenames/symlink9wrong
../menu/something/
+X: filenames: package-contains-broken-symlink
usr/share/doc/filenames/version.txt.gz ../filenames/doc/version6.txt.gz
+X: filenames: package-contains-broken-symlink usr/share/gtk-doc/html/bad
../doc/filenames/bad-devhelp
diff --git a/testset/tags.libbaz b/testset/tags.libbaz
index c47cda4..39f5131 100644
--- a/testset/tags.libbaz
+++ b/testset/tags.libbaz
@@ -71,4 +71,6 @@ W: libbaz2-dev: wrong-section-according-to-package-name
libbaz2-dev => libdevel
W: libbaz2: debian-changelog-file-is-a-symlink
W: libbaz2: package-name-doesnt-match-sonames libbaz2-1.0
W: libbaz2: symlink-should-be-relative usr/share/doc/libbaz2/changelog.gz
/usr/share/doc/lintian/changelog.gz
-X: libbaz2: package-contains-broken-symlink usr/share/doc/libbaz2/changelog.gz
/usr/share/doc/lintian/changelog.gz
+X: libbaz1: package-contains-broken-symlink usr/lib/libfoo.so.0.9
libfoo.so.0.9.1
+X: libbaz1: package-contains-broken-symlink usr/lib/libfoo3.so libfoo3.so.0.9
+X: libbaz2: package-contains-broken-symlink usr/share/doc/libbaz2/changelog.gz
usr/share/doc/lintian/changelog.gz
--
Debian package checker
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
