Remove an unused variable in dpkg-statoverride by renaming it to the

initially indented name. Closes: #425041

diff --git a/ChangeLog b/ChangeLog
index 56f2196ee52d0bfce32543592e06acf180bb6c39..ad80e52e60682f5118cdc5682ec97967977d1df7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-21  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-statoverride.pl ($pat): Rename to ...
+       ($pattern): ... this. Fixes $pattern being an unused variable.
+       ($file): Move the declaration to its first usage in the for loop.
+
 2007-05-15  Guillem Jover  <guillem@debian.org>
 
        * configure.ac: Bump version to 1.14.4~.

diff --git a/debian/changelog b/debian/changelog
index b8c27ce11d92c913d2f0dce497c52f5e0b2f5d1c..5e6d4f3380f093ee590188d7b5f4bf4fe8e0253f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 dpkg (1.14.4) UNRELEASED; urgency=low
 
-  * 
+  [ Guillem Jover ]
+  * Remove an unused variable in dpkg-statoverride by renaming it to the
+    initially indented name. Closes: #425041
 
  -- Guillem Jover <guillem@debian.org>  Tue, 15 May 2007 16:35:25 +0300
 

diff --git a/scripts/dpkg-statoverride.pl b/scripts/dpkg-statoverride.pl
index 405a86ff259a2dc278db0a481fe1884c43d123da..5ee877e92f312c63468309ba0fb63236c366cf7c 100755 (executable)
--- a/scripts/dpkg-statoverride.pl
+++ b/scripts/dpkg-statoverride.pl
@@ -167,8 +167,8 @@ if ($mode eq "add") {
        $dowrite=1;
        print(STDERR _g("warning: --update is useless for --remove")."\n") if ($doupdate);
 } elsif ($mode eq "list") {
-       my (@list,@ilist,$pattern,$file);
-       
+       my (@list, @ilist);
+
        @ilist= @ARGV ? @ARGV : ('*');
        while (defined($_=shift(@ilist))) {
                s/\W/\\$&/g;
@@ -177,10 +177,11 @@ if ($mode eq "add") {
                s,/+$,, && print STDERR _g("stripping trailing /")."\n";
                push(@list,"^$_\$");
        }
-       my $pat = join('|', @list);
+
+       my $pattern = join('|', @list);
        $exitcode=1;
-       for $file (keys %owner) {
-               next unless ($file =~ m/$pat/o);
+       for my $file (keys %owner) {
+               next unless ($file =~ m/$pattern/o);
                $exitcode=0;
                print "$owner{$file} $group{$file} $mode{$file} $file\n";
        }