From: Debian FreeIPA Team <pkg-freeipa-devel@alioth-lists.debian.net>
Date: Wed, 10 Jul 2019 07:05:31 +0000 (+0100)
Subject: perl-use-move-instead-of-rename
X-Git-Tag: archive/raspbian/1.4.1.5-1+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4d14a5f648ab2c219fd1aa26c86a4a4276b6c820;p=389-ds-base.git

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 189eb03..2b37806 100644
--- 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 5a2c019..97c03b3 100644
--- 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;