diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-09-01 12:07:05 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-09-01 12:07:05 +0000 |
| commit | 80a213f6178d5155867b1d24749f730382553f65 (patch) | |
| tree | 469d1edae713a94bdb140d44d7255f9f1b04e6ce | |
| parent | 5df2ffc5d06ea4fc25d970c1b16d75d51b8b6f08 (diff) | |
| download | urpmi-80a213f6178d5155867b1d24749f730382553f65.tar urpmi-80a213f6178d5155867b1d24749f730382553f65.tar.gz urpmi-80a213f6178d5155867b1d24749f730382553f65.tar.bz2 urpmi-80a213f6178d5155867b1d24749f730382553f65.tar.xz urpmi-80a213f6178d5155867b1d24749f730382553f65.zip | |
cleanup
| -rw-r--r-- | urpm/download.pm | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/urpm/download.pm b/urpm/download.pm index 228accda..8d21f9a6 100644 --- a/urpm/download.pm +++ b/urpm/download.pm @@ -871,13 +871,8 @@ sub _create_metalink_ { # Don't create a metalink when downloading mirror list $options->{media} or return; - my $mirrors; - foreach my $medium (@{$urpm->{media} || []}) { - if ($medium->{name} eq $options->{media}) { - my $mirrorlist = $medium->{mirrorlist}; - $mirrors = $urpm->{mirrors_cache}{$mirrorlist}; - } - } + my ($medium) = grep { $_->{name} eq $options->{media} } @{$urpm->{media} || []}; + my $mirrors = $urpm->{mirrors_cache}{$medium->{mirrorlist}}; my $metalinkfile = "$urpm->{cachedir}/$options->{media}.metalink"; # Even if not required by metalink spec, this line is needed at top of @@ -894,7 +889,9 @@ sub _create_metalink_ { push @metalink, qq(\t<file name=") . basename($append) . qq(">); push @metalink, qq(\t\t<resources>); - my $i = 0; foreach my $mirror (@{$mirrors->{list}}) { $i++; + my $i = 0; + foreach my $mirror (@{$mirrors->{list}}) { + $i++; my $type = $mirror->{url}; $type =~ s!://.*!!; # If more than 100 mirrors, give all the remaining mirrors a priority of 0 |