diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-03-03 14:06:55 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-03-03 14:06:55 +0000 |
| commit | c48b6ad56a4ce1f0ca891694b4cb022c9ddbc578 (patch) | |
| tree | cdec0f3b696ccbf476774c17c2959b0986645b02 | |
| parent | f43ea7435264d69adddaf7cfbf42bc20dddb022e (diff) | |
| download | drakx-c48b6ad56a4ce1f0ca891694b4cb022c9ddbc578.tar drakx-c48b6ad56a4ce1f0ca891694b4cb022c9ddbc578.tar.gz drakx-c48b6ad56a4ce1f0ca891694b4cb022c9ddbc578.tar.bz2 drakx-c48b6ad56a4ce1f0ca891694b4cb022c9ddbc578.tar.xz drakx-c48b6ad56a4ce1f0ca891694b4cb022c9ddbc578.zip | |
set urpmi in automatic mode for non-interactive installs
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/steps.pm | 3 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 2 |
3 files changed, 5 insertions, 2 deletions
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) { |