diff options
| author | Daouda Lo <daouda@mandriva.com> | 2004-10-19 07:17:10 +0000 |
|---|---|---|
| committer | Daouda Lo <daouda@mandriva.com> | 2004-10-19 07:17:10 +0000 |
| commit | b3d398736a23f88a4b7405308ffcfadad3644d5c (patch) | |
| tree | 41cbecac3ed5d5702efacf83798d538ed235cbf7 | |
| parent | 63721c558d6877bda1dbdbabea74142fa143ac74 (diff) | |
| download | drakx-backup-do-not-use-b3d398736a23f88a4b7405308ffcfadad3644d5c.tar drakx-backup-do-not-use-b3d398736a23f88a4b7405308ffcfadad3644d5c.tar.gz drakx-backup-do-not-use-b3d398736a23f88a4b7405308ffcfadad3644d5c.tar.bz2 drakx-backup-do-not-use-b3d398736a23f88a4b7405308ffcfadad3644d5c.tar.xz drakx-backup-do-not-use-b3d398736a23f88a4b7405308ffcfadad3644d5c.zip | |
- don't trigger help system when mandrake-doc-common is not installed
- don't trigger bug report in oem mode
| -rwxr-xr-x | perl-install/standalone/harddrake2 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 77412dec7..8bbb144f5 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -179,7 +179,9 @@ my @menu_items = [ join('', @{$menu_options{JAZZ_DETECTION}}), undef, sub { $options{JAZZ_DETECTION} = $check_boxes{JAZZ_DETECTION}->get_active }, undef, '<CheckItem>' ], [ $menus{help}, undef, undef, undef, '<Branch>' ], - [ $menus{help} . N("/_Help"), undef, sub { unless (fork()) { exec("drakhelp --id harddrake") } }, undef, '<Item>' ], + if_(-x "/usr/sbin/drakhelp_inst", + [ $menus{help} . N("/_Help"), undef, sub { unless (fork()) { exec("drakhelp --id harddrake") } }, undef, '<Item>' ], + ), [ $menus{help} . N("/_Fields description"), undef, sub { if ($current_device) { create_dialog(N("Harddrake help"), @@ -196,7 +198,9 @@ my @menu_items = }, undef, '<Item>' ], - [ $menus{help} . N("/_Report Bug"), undef, sub { unless (fork()) { exec("drakbug --report harddrake2 &") } }, undef, '<Item>' ], + if_(!-e "/etc/sysconfig/oem", + [ $menus{help} . N("/_Report Bug"), undef, sub { unless (fork()) { exec("drakbug --report harddrake2 &") } }, undef, '<Item>' ], + ), [ $menus{help} . N("/_About..."), undef, sub { create_dialog(N("About Harddrake"), #-PO: Do not alter the <span ..> and </span> tags |