summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-13 15:46:59 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-13 15:46:59 +0000
commit0fc52b8290d73f58a4115329902a205a3c517a43 (patch)
treec2e2ae82256b2f02ed602622a40b96fbcc28c505 /perl-install
parent30380736b2e6482766d74533b8bc6be21b829dc3 (diff)
downloaddrakx-0fc52b8290d73f58a4115329902a205a3c517a43.tar
drakx-0fc52b8290d73f58a4115329902a205a3c517a43.tar.gz
drakx-0fc52b8290d73f58a4115329902a205a3c517a43.tar.bz2
drakx-0fc52b8290d73f58a4115329902a205a3c517a43.tar.xz
drakx-0fc52b8290d73f58a4115329902a205a3c517a43.zip
when taking screenshot during pkgs install, we can be chrooted
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_any.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 1a210adbd..c1c351405 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1850,8 +1850,10 @@ sub X_options_from_o {
}
sub screenshot_dir__and_move() {
- my ($dir1, $dir2) = ("$::prefix/root", '/tmp');
- if (-e $dir1) {
+ my ($dir0, $dir1, $dir2) = ('/root', "$::prefix/root", '/tmp');
+ if (-e $dir0) {
+ $dir0; #- 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");