Parcourir la source

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

Adam Heath il y a 23 ans
Parent
commit
0397383aba
3 fichiers modifiés avec 10 ajouts et 0 suppressions
  1. 5 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 3 0
      scripts/dpkg-statoverride.pl

+ 5 - 0
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 ''.

+ 2 - 0
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
 

+ 3 - 0
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);