From: Adam Heath <doogie@debian.org>
Date: Sat, 13 Sep 2003 21:05:05 +0000 (+0000)
Subject: Fix "stripping trailing /" message from dpkg-statoverride.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77898c9cbc264cf4a824a5c92895366a98efd198;p=dpkg

Fix "stripping trailing /" message from dpkg-statoverride.
---

diff --git a/ChangeLog b/ChangeLog
index c3a4f637..64e530ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 13 16:04:37 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * scripts/dpkg-statoverride.pl: Fix "stripping trailing /" message from
+    dpkg-statoverride.
+
 Sat Sep 13 15:56:13 CDT 2003 Adam Heath <doogie@debian.org>
 
   * automake/tools.m4, dselect/Makefile.in, methods/disk.setup,
diff --git a/debian/changelog b/debian/changelog
index 4c645d6f..dcf9dc22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,9 @@ dpkg (1.10.11) unstable; urgency=low
   * Paul Eggert <eggert@CS.UCLA.EDU>:
     Apply patch to make dpkg work with POSIX 1003.1-2001.  Closes:
     #204894
+  * Joey Hess <joeyh@debian.org>:
+    Fix "stripping trailing /" message from dpkg-statoverride.  Closes:
+    #203782
 
  -- Wichert Akkerman <debian@extern.wiggy.net>  UNRELEASED
 
diff --git a/scripts/dpkg-statoverride.pl b/scripts/dpkg-statoverride.pl
index ee6fe10e..cdd01aa5 100755
--- a/scripts/dpkg-statoverride.pl
+++ b/scripts/dpkg-statoverride.pl
@@ -98,7 +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";
+	$file =~ s,/+$,, && print STDERR "stripping trailing /\n";
 
 	if (defined $owner{$file}) {
 		print STDERR "An override for \"$file\" already exists, ";
@@ -125,7 +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";
+	$file =~ s,/+$,, && print STDERR "stripping trailing /\n";
 	if (not defined $owner{$file}) {
 		print STDERR "No override present.\n";
 		exit(0) if ($doforce); 
@@ -144,7 +144,7 @@ if ($mode eq "add") {
 		s/\W/\\$&/g;
 		s/\\\?/./g;
 		s/\\\*/.*/g;
-		s,/*$,, && print STDERR "stripping trailing /\n";
+		s,/+$,, && print STDERR "stripping trailing /\n";
 		push(@list,"^$_\$");
 	}
 	$pat= join('|',@list);