[SCM] Debian package checker branch, master, updated. 2.2.8-10-g057ad27

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

The following commit has been merged in the master branch:
commit 057ad27bab24e57ac6d3a2423ca03d9a2e9b14a6
Author: Russ Allbery <rra@debian.org>
Date:   Sat Mar 28 11:33:17 2009 -0700

    Minor improvements to source package indexing
    
    * collection/file-info:
      + [RA] Use chomp instead of chop to remove newlines.
    * unpack/unpack-srcpkg-l1:
      + [RA] Better anchor the regexes that parse the file list in a source
        package.

diff --git a/collection/file-info b/collection/file-info
index dfa6b4c..39155f6 100755
--- a/collection/file-info
+++ b/collection/file-info
@@ -45,7 +45,7 @@ $opts{pipe_in}->blocking(1);
 open(INDEX, '<', "../index")
     or fail("cannot open index file: $!");
 while (<INDEX>) {
-    chop;
+    chomp;
     $_ = (split(" ", $_, 6))[5];
     s/ link to .*//;
     s/ -> .*//;
diff --git a/debian/changelog b/debian/changelog
index 326798d..b2edd83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,9 @@ lintian (2.2.9) UNRELEASED; urgency=low
     + [CW] Add karmic as an allowable distribution for Ubuntu (thanks, Soren
       Hansen).
 
+  * collection/file-info:
+    + [RA] Use chomp instead of chop to remove newlines.
+
   * data/changelog-file/ubuntu-dists:
     + [CW] Add karmic as an allowable distribution for Ubuntu (thanks, Soren
       Hansen).
@@ -35,6 +38,10 @@ lintian (2.2.9) UNRELEASED; urgency=low
     + [RA] In kill, initialize the result status and use &&= instead of |=.
       Partly addresses #521257.
 
+  * unpack/unpack-srcpkg-l1:
+    + [RA] Better anchor the regexes that parse the file list in a source
+      package.
+
  -- Frank Lichtenheld <djpig@debian.org>  Mon, 16 Mar 2009 00:13:30 +0100
 
 lintian (2.2.8) unstable; urgency=low
diff --git a/unpack/unpack-srcpkg-l1 b/unpack/unpack-srcpkg-l1
index ce01f14..fb6bc3d 100755
--- a/unpack/unpack-srcpkg-l1
+++ b/unpack/unpack-srcpkg-l1
@@ -126,7 +126,7 @@ my $prefix;
 for my $line (@index) {
     my ($file) = ($line =~ /^(?:\S+\s+){5}(.*)/);
     $file =~ s,^\./+,,;
-    my ($dir) = ($file =~ m,([^/]+),);
+    my ($dir) = ($file =~ m,^([^/]+),);
     if (defined($dir) and $dir eq $file and not $line =~ /^d/) {
         $prefix = '';
     } elsif (defined $dir) {
@@ -141,7 +141,7 @@ for my $line (@index) {
 }
 if ($prefix) {
     @index = map {
-        s,^((?:\S+\s+){5})(?:\./+)?\Q$prefix\E(?:/+|\z),$1,;
+        s,^((?:\S+\s+){5})(?:\./+)?\Q$prefix\E(?:/+|\Z),$1,;
         if (/^(?:\S+\s+){5}\S+/) {
             $_;
         } else {

-- 
Debian package checker