summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-03-23 19:50:12 +0000
committerThierry Vignaud <tv@mageia.org>2012-03-23 19:50:12 +0000
commite0d0347f266ae545f0b1b6ec3d638e1c41a74a38 (patch)
tree5d00fe15554fb1584ee1c87fd997746750a34626 /perl-install
parent0d9ab5125fed78454daa80dc2412d0e51c81552c (diff)
downloaddrakx-e0d0347f266ae545f0b1b6ec3d638e1c41a74a38.tar
drakx-e0d0347f266ae545f0b1b6ec3d638e1c41a74a38.tar.gz
drakx-e0d0347f266ae545f0b1b6ec3d638e1c41a74a38.tar.bz2
drakx-e0d0347f266ae545f0b1b6ec3d638e1c41a74a38.tar.xz
drakx-e0d0347f266ae545f0b1b6ec3d638e1c41a74a38.zip
(screenshot_dir__and_move) make it clearer
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/any.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 6ddb69407..d06813f4e 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -1234,9 +1234,10 @@ sub screenshot_dir__and_move() {
if (-e $dir0 && ! -e '/root/non-chrooted-marker.DrakX') {
($dir0, 'nowarn'); #- it occurs during pkgs install when we are chrooted
} elsif (-e $dir1) {
- if (-e "$dir2/DrakX-screenshots") {
- cp_af("$dir2/DrakX-screenshots", $dir1);
- rm_rf("$dir2/DrakX-screenshots");
+ my $path = "$dir2/DrakX-screenshots";
+ if (-e $path) {
+ cp_af($path, $dir1);
+ rm_rf($path);
}
$dir1;
} else {