summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-07-10 15:02:21 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-07-10 15:02:21 +0000
commit6958d0eaf86868ef620d297ec6d7913588975f30 (patch)
treef8d0ab134b157c32730cef79f1dd974b90a505d4
parenta01e65f4444eb10484b2cd0a0b0f83ab2ecdfe23 (diff)
downloaddrakx-backup-do-not-use-6958d0eaf86868ef620d297ec6d7913588975f30.tar
drakx-backup-do-not-use-6958d0eaf86868ef620d297ec6d7913588975f30.tar.gz
drakx-backup-do-not-use-6958d0eaf86868ef620d297ec6d7913588975f30.tar.bz2
drakx-backup-do-not-use-6958d0eaf86868ef620d297ec6d7913588975f30.tar.xz
drakx-backup-do-not-use-6958d0eaf86868ef620d297ec6d7913588975f30.zip
no need to test two times if modinfo is executable in normal (ie not
in drakx) case ...
-rw-r--r--perl-install/modparm.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/modparm.pm b/perl-install/modparm.pm
index ee5fd46ab..623590bc7 100644
--- a/perl-install/modparm.pm
+++ b/perl-install/modparm.pm
@@ -14,8 +14,10 @@ sub parameters {
my ($module) = @_;
my $modinfo = '/sbin/modinfo';
- -x $modinfo or $modinfo = '/usr/bin/modinfo';
- -x $modinfo or die _('modinfo is not available');
+ -x $modinfo or {
+ $modinfo = '/usr/bin/modinfo';
+ -x $modinfo or die _('modinfo is not available');
+ }
if (!$::isStandalone && !$::testing) {
modules::extract_modules('/tmp', $module);