summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-01-22 00:41:54 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-01-22 00:41:54 +0100
commitaaddffc8b7cbe3340adc69c397ef506e2a4f2965 (patch)
tree459686390848a22dfa886a04b58e4ae93cf612d6 /perl-install
parent0eb005c4912494eda1fd348bce8fd78800373349 (diff)
downloaddrakx-aaddffc8b7cbe3340adc69c397ef506e2a4f2965.tar
drakx-aaddffc8b7cbe3340adc69c397ef506e2a4f2965.tar.gz
drakx-aaddffc8b7cbe3340adc69c397ef506e2a4f2965.tar.bz2
drakx-aaddffc8b7cbe3340adc69c397ef506e2a4f2965.tar.xz
drakx-aaddffc8b7cbe3340adc69c397ef506e2a4f2965.zip
fix lost help screenshots (mga#11176)
The issue being that the help process doesn't know about $::prefix being /mnt... So we moved the screenshots several times :-( $ xzgrep fb2png report.bug.xz * running: fb2png /dev/fb0 /tmp/DrakX-screenshots/1.png 0 * running: fb2png /dev/fb0 //root/DrakX-screenshots/2.png 0 * running: fb2png /dev/fb0 /tmp/DrakX-screenshots/1.png 0 * running: fb2png /dev/fb0 /tmp/DrakX-screenshots/2.png 0 * running: fb2png /dev/fb0 //root/DrakX-screenshots/3.png 0 * running: fb2png /dev/fb0 /tmp/DrakX-screenshots/1.png 0 * running: fb2png /dev/fb0 /tmp/DrakX-screenshots/2.png 0 * running: fb2png /dev/fb0 //root/DrakX-screenshots/4.png 0 * running: fb2png /dev/fb0 /tmp/DrakX-screenshots/1.png 0 * running: fb2png /dev/fb0 /tmp/DrakX-screenshots/2.png 0 * running: fb2png /dev/fb0 //root/DrakX-screenshots/5.png 0 * running: fb2png /dev/fb0 /tmp/DrakX-screenshots/1.png 0 * running: fb2png /dev/fb0 /tmp/DrakX-screenshots/2.png 0 * running: fb2png /dev/fb0 /tmp/DrakX-screenshots/3.png 0 * running: fb2png /dev/fb0 /tmp/DrakX-screenshots/4.png 0 * running: fb2png /dev/fb0 /tmp/DrakX-screenshots/5.png 0 * running: fb2png /dev/fb0 /tmp/DrakX-screenshots/6.png 0 * running: fb2png /dev/fb0 /mnt/root/DrakX-screenshots/7.png 0 * running: fb2png /dev/fb0 /mnt/root/DrakX-screenshots/8.png 0 * running: fb2png /dev/fb0 /mnt/root/DrakX-screenshots/9.png 0 * running: fb2png /dev/fb0 /mnt/root/DrakX-screenshots/10.png 0 (...)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS1
-rwxr-xr-xperl-install/standalone/display_installer_help2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 1db139ec7..268c22983 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,7 @@
o add a warning about QWERTY keyboard
- help dialogs:
o do warn on first screenshot (mga#11176)
+ o fix lost help screenshots (mga#11176)
Version 16.26.3 - 21 January 2014
diff --git a/perl-install/standalone/display_installer_help b/perl-install/standalone/display_installer_help
index 2a395daec..1e9de23cb 100755
--- a/perl-install/standalone/display_installer_help
+++ b/perl-install/standalone/display_installer_help
@@ -23,6 +23,7 @@ use any;
use lang;
# so that screenshots works:
+$::prefix = '/mnt';
use install::any;
$::isInstall = 1;
@@ -33,7 +34,6 @@ any::set_wm_hints_if_needed($in);
# Fake enough $o for retrieving the proper translation:
$::o = $in;
$::o->{locale}{lang} = $ARGV[1];
-$::prefix = '/';
lang::set($::o->{locale});
$in->display_help_window({ interactive_help_id => $ARGV[0] });