summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-14 15:44:30 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-14 15:44:30 +0000
commit50cbea4ca6eb5417228421db15e2326e478fbc4e (patch)
treec75e3264ef8240907c1dec497c0ffe4652859817
parent7fc751e006748d1247430c9c22534fae75e3be00 (diff)
downloaddrakx-50cbea4ca6eb5417228421db15e2326e478fbc4e.tar
drakx-50cbea4ca6eb5417228421db15e2326e478fbc4e.tar.gz
drakx-50cbea4ca6eb5417228421db15e2326e478fbc4e.tar.bz2
drakx-50cbea4ca6eb5417228421db15e2326e478fbc4e.tar.xz
drakx-50cbea4ca6eb5417228421db15e2326e478fbc4e.zip
fix logic test order in order to prevent useless error message in --testing mode
-rw-r--r--perl-install/install2.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index af9c22473..9f11f5476 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -291,7 +291,7 @@ sub configureX {
modules::write_conf();
require pkgs;
- installStepsCall($o, $auto, 'configureX') if pkgs::packageByName($o->{packages}, 'XFree86')->flag_installed && !$o->{X}{disabled} || $::testing;
+ installStepsCall($o, $auto, 'configureX') if $::testing && pkgs::packageByName($o->{packages}, 'XFree86')->flag_installed && !$o->{X}{disabled} ;
}
#------------------------------------------------------------------------------
sub exitInstall {