summaryrefslogtreecommitdiffstats
path: root/perl-install/install/media.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-03-23 19:50:35 +0000
committerThierry Vignaud <tv@mageia.org>2012-03-23 19:50:35 +0000
commitf4bc86bc94aeeeffb8a82b16b38b760590b80bdf (patch)
treeb5a904657487cd5dfec16ca195ee72b9098a086f /perl-install/install/media.pm
parentcb09d79bc963f95780d214aa12e695d8f9e338e2 (diff)
downloaddrakx-f4bc86bc94aeeeffb8a82b16b38b760590b80bdf.tar
drakx-f4bc86bc94aeeeffb8a82b16b38b760590b80bdf.tar.gz
drakx-f4bc86bc94aeeeffb8a82b16b38b760590b80bdf.tar.bz2
drakx-f4bc86bc94aeeeffb8a82b16b38b760590b80bdf.tar.xz
drakx-f4bc86bc94aeeeffb8a82b16b38b760590b80bdf.zip
perl_checker cleanups
Diffstat (limited to 'perl-install/install/media.pm')
-rw-r--r--perl-install/install/media.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 95a5728ff..27b931266 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -486,11 +486,11 @@ sub _parse_media_cfg {
sub select_only_some_media {
my ($media_list, $selected_names) = @_;
my @names = split(',', $selected_names);
- foreach my $m (@{$media_list}) {
+ foreach my $m (@$media_list) {
my $bool = !member($m->{name}, @names);
# workaround urpmi transforming "ignore => ''" or "ignore => 0" into "ignore => 1":
undef $bool if !$bool;
- log::l "disabling '$m->{name}' medium: " . to_bool($bool);
+ log::l("disabling '$m->{name}' medium: " . to_bool($bool));
urpm::media::_tempignore($m, $bool);
# make sure we update un-ignored media (eg: */Testing and the like):
$m->{modified} = 1 if !$bool;
@@ -715,13 +715,13 @@ sub get_standalone_medium {
}
sub _get_medium {
- my ($in_wait, $phys_m, $packages, $m) = @_;
+ my ($_in_wait, $phys_m, $packages, $m) = @_;
!$m->{ignore} or log::l("ignoring packages in $m->{rel_hdlist}"), return;
my $url = _get_media_url({}, $phys_m);
log::l("trying '$url'\n");
- urpm::media::add_medium($packages, $m->{name} || 'Supplementary medium', $url) or $packages->{fatal}(10, N("unable to add medium"));
+ urpm::media::add_medium($packages, $m->{name} || 'Supplementary medium', $url, 0) or $packages->{fatal}(10, N("unable to add medium"));
}