summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-10-23 15:40:46 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-10-23 15:40:46 +0000
commitc555e7d62df38a839bb243347062cead77f89922 (patch)
treef4b10551ab95f1301ce8b55aa015762512d4fdd9
parent64a16a8f78ae8828eb723b587ee291c47e005ff0 (diff)
downloaddrakx-c555e7d62df38a839bb243347062cead77f89922.tar
drakx-c555e7d62df38a839bb243347062cead77f89922.tar.gz
drakx-c555e7d62df38a839bb243347062cead77f89922.tar.bz2
drakx-c555e7d62df38a839bb243347062cead77f89922.tar.xz
drakx-c555e7d62df38a839bb243347062cead77f89922.zip
added some carriage returns to please jl :)
-rw-r--r--perl-install/ChangeLog8
-rw-r--r--perl-install/install_steps.pm6
2 files changed, 12 insertions, 2 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 5a8c2ac30..c1cf30444 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-19 DrakX <install@linux-mandrake.com>
+
+ * snapshot uploaded
+
+2000-10-17 DrakX <install@linux-mandrake.com>
+
+ * snapshot uploaded
+
2000-10-16 Pablo Saratxaga <pablo@mandrakesoft.com>
* standalone/keyboarddrake,keyboard.pm: corrected BackSpace setting
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index bc93ae6ba..6efde2f53 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -337,13 +337,15 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK!
#- important files and restore them after.
foreach (@{$o->{toSave} || []}) {
if (-e "$o->{prefix}/$_") {
- unlink "$o->{prefix}/$_.mdkgisave"; eval { commands::cp("$o->{prefix}/$_", "$o->{prefix}/$_.mdkgisave") };
+ unlink "$o->{prefix}/$_.mdkgisave";
+ eval { commands::cp("$o->{prefix}/$_", "$o->{prefix}/$_.mdkgisave") };
}
}
pkgs::remove($o->{prefix}, $o->{toRemove});
foreach (@{$o->{toSave} || []}) {
if (-e "$o->{prefix}/$_.mdkgisave") {
- unlink "$o->{prefix}/$_"; rename "$o->{prefix}/$_.mdkgisave", "$o->{prefix}/$_";
+ unlink "$o->{prefix}/$_";
+ rename "$o->{prefix}/$_.mdkgisave", "$o->{prefix}/$_";
}
}
$o->{toSave} = [];