Strip trailing / from the file args in dpkg-statoverride.

diff --git a/ChangeLog b/ChangeLog
index 9c7e3d8e552c7629ceadcc2c8d02325bbbc281d5..7c5e878043fe2f2e98916ae3fa347f82b61dc23e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr 15 00:35:40 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * scripts/dpkg-statoverride.pl: Strip trailing / from the file args in
+    dpkg-statoverride.
+
 Tue Apr 15 00:26:06 CDT 2003 Adam Heath <doogie@debian.org>
 
   * Makefile.in: Surround sed call with ''.

diff --git a/debian/changelog b/debian/changelog
index 0f1ad5920ac1c7c466c59bc916af21841a09113a..ab868d1dd7aca14d231c2e7081f79674393b68bd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ dpkg (1.10.10) unstable; urgency=low
   * Update archtable for hurd.  Closes: #187509.
   * Make the dpkg-iasearch conflicts versioned.  Closes: #170698.
   * Surround sed call with '' in Makefile.in.  Closes: #187534.
+  * Strip trailing / from the file args in dpkg-statoverride.  Closes:
+    #184239.
 
  -- Adam Heath <doogie@debian.org>  UNRELEASED
 

diff --git a/scripts/dpkg-statoverride.pl b/scripts/dpkg-statoverride.pl
index 38cb7b4c651b1249eee3ddcfb00ce781d58b3551..ee6fe10e11408fc1d711456b35e379fcade29a8c 100755 (executable)
--- a/scripts/dpkg-statoverride.pl
+++ b/scripts/dpkg-statoverride.pl
@@ -98,6 +98,7 @@ if ($mode eq "add") {
        (($mode<0) or (oct($mode)>07777)) && &badusage("illegal mode $mode");
        $file= $ARGV[3];
        $file =~ m/\n/ && &badusage("file may not contain newlines");
+       $file =~ s,/*$,, && print STDERR "stripping trailing /\n";
 
        if (defined $owner{$file}) {
                print STDERR "An override for \"$file\" already exists, ";
@@ -124,6 +125,7 @@ if ($mode eq "add") {
 } elsif ($mode eq "remove") {
        @ARGV==1 || &badusage("--remove needs one arguments");
        $file=$ARGV[0];
+       $file =~ s,/*$,, && print STDERR "stripping trailing /\n";
        if (not defined $owner{$file}) {
                print STDERR "No override present.\n";
                exit(0) if ($doforce); 
@@ -142,6 +144,7 @@ if ($mode eq "add") {
                s/\W/\\$&/g;
                s/\\\?/./g;
                s/\\\*/.*/g;
+               s,/*$,, && print STDERR "stripping trailing /\n";
                push(@list,"^$_\$");
        }
        $pat= join('|',@list);