From c48b6ad56a4ce1f0ca891694b4cb022c9ddbc578 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 3 Mar 2009 14:06:55 +0000
Subject: set urpmi in automatic mode for non-interactive installs

---
 perl-install/install/NEWS                 | 2 ++
 perl-install/install/steps.pm             | 3 ++-
 perl-install/install/steps_interactive.pm | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index f18134eeb..a9557af8d 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- set urpmi in automatic mode for non-interactive installs
+
 Version 12.0 - 3 March 2009
 
 - media management & package installation:
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 702c3cd52..fb3acde1b 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -409,7 +409,7 @@ sub installCallback {
 }
 
 sub installPackages {
-    my ($o) = @_;
+    my ($o, $o_interactive) = @_;
     my $packages = $o->{packages};
 
     install::pkgs::remove_marked_ask_remove($packages, \&installCallback);
@@ -423,6 +423,7 @@ sub installPackages {
 	local $ENV{TMPDIR} = '/tmp';
 	local $ENV{TMP} = '/tmp';
 	local $ENV{HOME};
+	local $packages->{options}{auto} = to_bool($o_interactive);
 	install::pkgs::install($o->{isUpgrade}, \@toInstall, $packages, \&installCallback);
     }
     any::writeandclean_ldsoconf($::prefix);
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 973d97e88..a956419a7 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -649,7 +649,7 @@ sub installPackages {
     };
 
     my $install_result;
-    catch_cdie { $install_result = $o->install::steps::installPackages($packages) }
+    catch_cdie { $install_result = $o->install::steps::installPackages($packages, 'interactive') }
       sub { installPackages__handle_error($o, $_[0]) };
 
     if ($install::pkgs::cancel_install) {
-- 
cgit v1.2.1