perl-use-move-instead-of-rename

Gbp-Pq: Name perl-use-move-instead-of-rename.diff

diff --git a/ldap/admin/src/scripts/60upgradeconfigfiles.pl b/ldap/admin/src/scripts/60upgradeconfigfiles.pl
index 189eb0376c8a94dcc370d48955ffd10c0a7049e4..2b37806e4153d21a3aff74669adae7cf327fef5a 100644 (file)
--- a/ldap/admin/src/scripts/60upgradeconfigfiles.pl
+++ b/ldap/admin/src/scripts/60upgradeconfigfiles.pl
@@ -31,7 +31,7 @@ sub runinst {
         next if (! -f $oldname); # does not exist - skip - already (re)moved
         my $newname = "$bakdir/$file";
         $! = 0; # clear
-        rename $oldname, $newname;
+        copy $oldname, $newname;
         if ($!) {
             push @errs, ["error_renaming_config", $oldname, $newname, $!];
         }
@@ -57,7 +57,7 @@ sub runinst {
             next if (! -f $oldname); # does not exist - not backed up
             my $newname = $inf->{slapd}->{config_dir} . "/" . $file;
             next if (-f $newname); # not removed
-            rename $oldname, $newname;
+            move $oldname, $newname;
         }
         return @errs;
     }

diff --git a/ldap/admin/src/scripts/60upgradeschemafiles.pl b/ldap/admin/src/scripts/60upgradeschemafiles.pl
index 5a2c01926d776697c532972dd8873caf77ad511c..97c03b333180116a17934de988e141a40f2c8869 100644 (file)
--- a/ldap/admin/src/scripts/60upgradeschemafiles.pl
+++ b/ldap/admin/src/scripts/60upgradeschemafiles.pl
@@ -1,4 +1,4 @@
-
+use File::Copy;
 use Mozilla::LDAP::LDIF;
 use DSCreate qw(installSchema);
 
@@ -39,7 +39,7 @@ sub runinst {
         next if (! -f $oldname); # does not exist - skip - already (re)moved
         my $newname = "$bakdir/$file";
         $! = 0; # clear
-        rename $oldname, $newname;
+        copy $oldname, $newname;
         if ($!) {
             push @errs, ["error_renaming_schema", $oldname, $newname, $!];
         }
@@ -140,7 +140,7 @@ sub runinst {
 
     # Backup the original 99user.ldif
     $! = 0; # clear
-    rename $inf->{slapd}->{schema_dir} . "/99user.ldif", "$bakdir/99user.ldif";
+    copy $inf->{slapd}->{schema_dir} . "/99user.ldif", "$bakdir/99user.ldif";
     if ($!) {
         push @errs, ["error_renaming_schema", $inf->{slapd}->{schema_dir} . "/99user.ldif", "$bakdir/99user.ldif", $!];
     }
@@ -171,13 +171,13 @@ sub runinst {
             next if (! -f $oldname); # does not exist - not backed up
             my $newname = $inf->{slapd}->{schema_dir} . "/" . $file;
             next if (-f $newname); # not removed
-            rename $oldname, $newname;
+            move $oldname, $newname;
         }
 
         # Restore 99user.ldif. We overwrite whatever is there since
         # it is possible that we have modified it.
         if (-f "$bakdir/99user.ldif") {
-                rename "$bakdir/99user.ldif", $inf->{slapd}->{schema_dir} . "/99user.ldif";
+                move "$bakdir/99user.ldif", $inf->{slapd}->{schema_dir} . "/99user.ldif";
         }
 
         return @errs;