summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-12-10 06:50:50 +0000
committerThierry Vignaud <tv@mageia.org>2011-12-10 06:50:50 +0000
commit759451bfa88baa795268f8cc8c6162064acf4966 (patch)
tree836927fb1a4aaaf1594f78abb416c7d7f204e38e
parent6f2be2328fad664f2efa6ea44c191fa0a6ad9a88 (diff)
downloaddrakx-759451bfa88baa795268f8cc8c6162064acf4966.tar
drakx-759451bfa88baa795268f8cc8c6162064acf4966.tar.gz
drakx-759451bfa88baa795268f8cc8c6162064acf4966.tar.bz2
drakx-759451bfa88baa795268f8cc8c6162064acf4966.tar.xz
drakx-759451bfa88baa795268f8cc8c6162064acf4966.zip
drakhelp: make it work somewhat despite lack of doc
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/drakhelp6
2 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 0b1dfe97e..1827b357d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- drakhelp: make it work somewhat despite lack of doc
- prevent net_applet to crash on notifications without icons (mga#2876)
- harddrake: prevent detecting some soft modems as scanners (mga#2753)
diff --git a/perl-install/standalone/drakhelp b/perl-install/standalone/drakhelp
index 2e77168a0..39781da91 100755
--- a/perl-install/standalone/drakhelp
+++ b/perl-install/standalone/drakhelp
@@ -9,7 +9,7 @@ use standalone; #- warning, standalone must be loaded very first, for 'expla
use interactive;
use common;
use any;
-use ctxhelp;
+eval { require ctxhelp };
use log;
@@ -31,14 +31,14 @@ my ($opt, $idlabel) = @ARGV;
-my ($instpath, $ancpath, $package) = ctxhelp::path2help($opt, $idlabel);
+my ($instpath, $ancpath, $package) = eval { ctxhelp::path2help($opt, $idlabel) };
if (! -e $instpath) {
system('/usr/sbin/drakhelp_inst', $package);
}
if (! -e $instpath) {
#- trying again, asking for the english entry
- ($instpath, $ancpath, my $package2) = ctxhelp::path2help($opt, $idlabel, 'en');
+ ($instpath, $ancpath, my $package2) = eval { ctxhelp::path2help($opt, $idlabel, 'en') };
if (! -e $instpath && $package ne $package2) {
system("/usr/sbin/drakhelp_inst $package2");
}