summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-05-17 08:15:29 +0000
committerThierry Vignaud <tv@mageia.org>2012-05-17 08:15:29 +0000
commita41d15bb00754af21e455a40e10e8fdc8867b6fd (patch)
treeab8b486632661822fde815c05662ff220c2fc827
parent4c31bb52c914b52ca9be1bafc647de5557140767 (diff)
downloadurpmi-a41d15bb00754af21e455a40e10e8fdc8867b6fd.tar
urpmi-a41d15bb00754af21e455a40e10e8fdc8867b6fd.tar.gz
urpmi-a41d15bb00754af21e455a40e10e8fdc8867b6fd.tar.bz2
urpmi-a41d15bb00754af21e455a40e10e8fdc8867b6fd.tar.xz
urpmi-a41d15bb00754af21e455a40e10e8fdc8867b6fd.zip
fix -m option not showing media names (mga#5916)
-rw-r--r--NEWS3
-rwxr-xr-xurpmf6
2 files changed, 6 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 61a8a4ee..606ee149 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- urpmf:
+ o fix -m option not showing media names (mga#5916)
+
Version 6.48.1 - 23 April 2012
- urpmi:
diff --git a/urpmf b/urpmf
index b13b53f1..e87a7298 100755
--- a/urpmf
+++ b/urpmf
@@ -286,21 +286,21 @@ urpm::media::configure($urpm,
# nb: we don't "my" $medium since it is used for $callback
if ($needed_media_info{hdlist}) {
- foreach my $medium (urpm::media::non_ignored_media($urpm)) {
+ foreach $medium (urpm::media::non_ignored_media($urpm)) {
my $hdlist = urpm::media::any_hdlist($urpm, $medium, $options{verbose} < 0) or
$urpm->{error}(N("no hdlist available for medium \"%s\"", $medium->{name})), next;
$urpm->{log}("getting information from $hdlist");
$urpm->parse_hdlist($hdlist, callback => $callback);
}
} elsif (!@needed_xml_info) {
- foreach my $medium (urpm::media::non_ignored_media($urpm)) {
+ foreach $medium (urpm::media::non_ignored_media($urpm)) {
my $synthesis = urpm::media::any_synthesis($urpm, $medium) or
$urpm->{error}(N("no synthesis available for medium \"%s\"", $medium->{name})), next;
$urpm->{log}("getting information from $synthesis");
$urpm->parse_synthesis($synthesis, callback => $callback);
}
} elsif (my ($xml_info) = @needed_xml_info) {
- foreach my $medium (urpm::media::non_ignored_media($urpm)) {
+ foreach $medium (urpm::media::non_ignored_media($urpm)) {
my $xml_info_file = urpm::media::any_xml_info($urpm, $medium, $xml_info, $options{verbose} < 0);
if (!$xml_info_file) {
my $hdlist = urpm::media::any_hdlist($urpm, $medium, $options{verbose} < 0) or