From 9ee1d2a5e87fd1de5f9162f0a101145756451956 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Wed, 3 Jan 2001 10:15:35 +0000
Subject: fixed usage with testing

---
 perl-install/install2.pm      | 3 ++-
 perl-install/install_steps.pm | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 29c251ab2..fc07b9693 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -432,7 +432,8 @@ sub configureX {
     fs::write($o->{prefix}, $o->{fstab}, $o->{manualFstab}, $o->{useSupermount});
     modules::write_conf($o->{prefix});
 
-    $o->configureX($clicked) if pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'XFree86')) && !$o->{X}{disabled} || $clicked;
+    require pkgs;
+    $o->configureX($clicked) if pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'XFree86')) && !$o->{X}{disabled} || $clicked || $::testing;
 }
 #------------------------------------------------------------------------------
 sub generateAutoInstFloppy { $o->generateAutoInstFloppy }
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 55dbf6849..11abcb06c 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -302,7 +302,11 @@ sub pkg_install {
     my ($o, @l) = @_;
     log::l("selecting packages");
     require pkgs;
-    pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, $_) || die "$_ rpm not found") foreach @l;
+    if ($::testing) {
+	log::l("selecting package \"$_\"") foreach @l;
+    } else {
+	pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, $_) || die "$_ rpm not found") foreach @l;
+    }
     my @toInstall = pkgs::packagesToInstall($o->{packages});
     if (@toInstall) {
 	log::l("installing packages");
-- 
cgit v1.2.1