diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-04-24 14:17:57 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-04-24 14:17:57 +0000 |
| commit | ff327a907e34ef06c347104f9f9c7b6084c9a376 (patch) | |
| tree | a3e70872f534a105e05d45ee64fb5c0cffc5fabd | |
| parent | eaee3f207a02a6f6ed129292ee20cc767040eb2d (diff) | |
| download | drakx-backup-do-not-use-ff327a907e34ef06c347104f9f9c7b6084c9a376.tar drakx-backup-do-not-use-ff327a907e34ef06c347104f9f9c7b6084c9a376.tar.gz drakx-backup-do-not-use-ff327a907e34ef06c347104f9f9c7b6084c9a376.tar.bz2 drakx-backup-do-not-use-ff327a907e34ef06c347104f9f9c7b6084c9a376.tar.xz drakx-backup-do-not-use-ff327a907e34ef06c347104f9f9c7b6084c9a376.zip | |
remove unused parameter in installPackages (fix passing interactive setting)
| -rw-r--r-- | perl-install/install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/install/steps_auto_install.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 4 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index c85e26e61..9287b6ffb 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- remove unused parameter in installPackages + (fix passing interactive setting) + Version 12.34 - 24 April 2009 - do not set urpmi in automatic mode for gtk installs diff --git a/perl-install/install/steps_auto_install.pm b/perl-install/install/steps_auto_install.pm index dfaa5f0e3..b1e9a4771 100644 --- a/perl-install/install/steps_auto_install.pm +++ b/perl-install/install/steps_auto_install.pm @@ -132,7 +132,7 @@ sub errorInStep { #-###################################################################################### sub installPackages { my ($o, $packages) = @_; - catch_cdie { $o->install::steps::installPackages($packages) } sub { print formatError($@), "\n"; 1 }; + catch_cdie { $o->install::steps::installPackages } sub { print formatError($@), "\n"; 1 }; } 1; diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index 694278119..9e9a55eef 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -526,7 +526,7 @@ sub beforeInstallPackages { #------------------------------------------------------------------------------ sub installPackages { - my ($o, $packages) = @_; + my ($o) = @_; my ($current_total_size, $last_size, $nb, $total_size, $last_dtime, $_trans_progress_total); @@ -631,7 +631,7 @@ sub installPackages { } }; my $install_result; - catch_cdie { $install_result = $o->install::steps::installPackages($packages, 'interactive') } + catch_cdie { $install_result = $o->install::steps::installPackages('interactive') } sub { my $rc = install::steps_interactive::installPackages__handle_error($o, $_[0]); $rc or $w->destroy; diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 27748413a..2719c2b48 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -628,7 +628,7 @@ sub reallyChooseGroups { #------------------------------------------------------------------------------ sub installPackages { - my ($o, $packages) = @_; + my ($o) = @_; my ($current, $total) = (0, 0); my ($_w, $wait_message) = $o->wait_message_with_progress_bar(N("Installing")); @@ -646,7 +646,7 @@ sub installPackages { }; my $install_result; - catch_cdie { $install_result = $o->install::steps::installPackages($packages, 'interactive') } + catch_cdie { $install_result = $o->install::steps::installPackages('interactive') } sub { installPackages__handle_error($o, $_[0]) }; if ($install::pkgs::cancel_install) { |