aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-03-26 18:21:35 +0000
committerThierry Vignaud <tv@mageia.org>2012-03-26 18:21:35 +0000
commitf3f66a027365956353355a9dd81aa0932c8840b5 (patch)
treebd256bb7c53ea95c3b0c177f6b64198c8f1b4ba0
parent2485367155e9a7d4a4efa5a019b731c3390b3ddf (diff)
downloadrpmdrake-f3f66a027365956353355a9dd81aa0932c8840b5.tar
rpmdrake-f3f66a027365956353355a9dd81aa0932c8840b5.tar.gz
rpmdrake-f3f66a027365956353355a9dd81aa0932c8840b5.tar.bz2
rpmdrake-f3f66a027365956353355a9dd81aa0932c8840b5.tar.xz
rpmdrake-f3f66a027365956353355a9dd81aa0932c8840b5.zip
(get_pkgs,warn_about_media) pass a hash of options instead of a hash reference
also rename %opts as %options btw (inspirated from mdv)
-rw-r--r--Rpmdrake/gui.pm2
-rw-r--r--Rpmdrake/pkg.pm8
2 files changed, 5 insertions, 5 deletions
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index 6a667751..5b210869 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -626,7 +626,7 @@ sub is_updatable {
sub pkgs_provider {
my ($mode, %options) = @_;
return if !$mode;
- my $h = &get_pkgs(\%options);
+ my $h = &get_pkgs(%options);
($urpm, $descriptions) = @$h{qw(urpm update_descr)};
$pkgs = $h->{all_pkgs};
%filters = (
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index ea9e3e36..66b09b08 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -228,7 +228,7 @@ sub download_callback {
my (@update_medias, $is_update_media_already_asked);
sub warn_about_media {
- my ($w, $opts) = @_;
+ my ($w, %options) = @_;
return if $::MODE ne 'update';
return if $::rpmdrake_options{'no-media-update'};
@@ -246,7 +246,7 @@ sub warn_about_media {
$::rpmdrake_options{'no-media-update'} ||= 1;
if (@update_medias > 0) {
- if (!$opts->{skip_updating_mu} && !$is_update_media_already_asked) {
+ if (!$options{skip_updating_mu} && !$is_update_media_already_asked) {
$is_update_media_already_asked = 1;
$::rpmdrake_options{'no-confirmation'} or interactive_msg(N("Confirmation"),
N("I need to contact the mirror to get latest update packages.
@@ -431,14 +431,14 @@ sub get_updates_list {
}
sub get_pkgs {
- my ($opts) = @_;
+ my (%options) = @_;
my $w = $::main_window;
my $gurpm = Rpmdrake::gurpm->new(1 ? N("Please wait") : N("Package installation..."), N("Initializing..."), transient => $::main_window);
my $_gurpm_clean_guard = before_leaving { undef $gurpm };
#my $_flush_guard = Gtk2::GUI_Update_Guard->new;
- warn_about_media($w, $opts);
+ warn_about_media($w, %options);
my $urpm = open_urpmi_db(update => $probe_only_for_updates && !is_it_a_devel_distro());