From e0d0347f266ae545f0b1b6ec3d638e1c41a74a38 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 23 Mar 2012 19:50:12 +0000 Subject: (screenshot_dir__and_move) make it clearer --- perl-install/install/any.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'perl-install') 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 { -- cgit v1.2.1