more dpkg-statoverride fixes

diff --git a/ChangeLog b/ChangeLog
index c06419b22c3be3a350b928bd5b20ad31762489cf..25dbbab9484c20068e05aee5f3af62fa201a0ebb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 Thu Nov 30 02:45:42 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
-  * scripts/dpkg-statoverride.{pl,8}: add new --import option to
-    import settings from /etc/suid.conf
+  * scripts/dpkg-statoverride.{pl,8}: 
+    + add new --import option to import settings from /etc/suid.conf
+    + fix ENOENT issues
+    + use %owner consistently isntead of %owner and %user
 
 Wed Nov 29 17:56:43 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 

diff --git a/scripts/dpkg-statoverride.pl b/scripts/dpkg-statoverride.pl
index 6b20e431acddb0ab8a91e88b33ede063db1ecf7d..d7e3118f5850da981620a33888b7c99c5084193f 100755 (executable)
--- a/scripts/dpkg-statoverride.pl
+++ b/scripts/dpkg-statoverride.pl
@@ -102,7 +102,7 @@ if ($mode eq "add") {
        $file= $ARGV[3];
        $file =~ m/\n/ && &badusage("file may not contain newlines");
 
-       if (defined $user{$file}) {
+       if (defined $owner{$file}) {
                print STDERR "An override for \"$file\" already exists, ";
                if ($doforce) {
                        print STDERR "but --force specified so lets ignore it.\n";
@@ -111,7 +111,7 @@ if ($mode eq "add") {
                        exit(3);
                }
        }
-       $user{$file}=$user;
+       $owner{$file}=$user;
        $group{$file}=$group;
        $mode{$file}=$mode;
        $dowrite=1;
@@ -127,11 +127,11 @@ if ($mode eq "add") {
 } elsif ($mode eq "remove") {
        @ARGV==1 || &badusage("--remove needs one arguments");
        $file=$ARGV[0];
-       if (not defined $user{$file}) {
+       if (not defined $owner{$file}) {
                print "No override present.";
                exit(0);
        }
-       delete $user{$file};
+       delete $owner{$file};
        delete $group{$file};
        delete $mode{$file};
        $dowrite=1;
@@ -140,7 +140,7 @@ if ($mode eq "add") {
        @ARGV==2 || &badusage("--import needs two arguments");
        $pkg=$ARGV[0];
        $file=$ARGV[1];
-       if (defined $user{$file}) {
+       if (defined $owner{$file}) {
                print STDERR "An override for \"$file\" already exists, ";
                if ($doforce) {
                        print STDERR "but --force specified so lets ignore it.\n";
@@ -158,7 +158,7 @@ if ($mode eq "add") {
                next if ($sm_pkg eq $pkg);
                $sm_user="#$sm_user" if ($sm_user =~ m/^\d*$/);
                $sm_group="#$sm_group" if ($sm_group =~ m/^\d*$/);
-               $user{$fm_file}=$sm_user;
+               $owner{$fm_file}=$sm_user;
                $group{$fm_file}=$sm_group;
                if ( -x "/usr/sbin/suidunregister") {
                        @args = ("suidunregister", "$file");