summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-08-10 21:38:59 +0000
committerThierry Vignaud <tv@mandriva.org>2007-08-10 21:38:59 +0000
commit706278f0f76ceb85627bac913e95ac5879e11c4d (patch)
treee2da5b6571e897afe3249bc0fea8b5e497c366fb
parent2daba02018df2284fa4f213750d011fee42a4d0a (diff)
downloadurpmi-706278f0f76ceb85627bac913e95ac5879e11c4d.tar
urpmi-706278f0f76ceb85627bac913e95ac5879e11c4d.tar.gz
urpmi-706278f0f76ceb85627bac913e95ac5879e11c4d.tar.bz2
urpmi-706278f0f76ceb85627bac913e95ac5879e11c4d.tar.xz
urpmi-706278f0f76ceb85627bac913e95ac5879e11c4d.zip
(get_updates_description) rpmdrake wants the medium name
-rw-r--r--urpm.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/urpm.pm b/urpm.pm
index 0efe5769..b7ec2884 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -233,7 +233,8 @@ sub get_updates_description {
@update_medias or @update_medias = grep { !$_->{ignore} && $_->{update} } @{$urpm->{media}};
- foreach (map { cat_utf8(urpm::media::statedir_descriptions($urpm, $_)), '%package dummy' } @update_medias) {
+ foreach my $medium (@update_medias) {
+ foreach (cat_utf8(urpm::media::statedir_descriptions($urpm, $medium)), '%package dummy') {
/^%package (.+)/ and do {
if (exists $cur->{importance} && $cur->{importance} ne "security" && $cur->{importance} ne "bugfix") {
$cur->{importance} = 'normal';
@@ -241,6 +242,7 @@ sub get_updates_description {
$update_descr{$_} = $cur foreach @{$cur->{pkgs}};
$cur = {};
$cur->{pkgs} = [ split /\s/, $1 ];
+ $cur->{medium} = $medium->{name};
$section = 'pkg';
next;
};
@@ -251,6 +253,7 @@ sub get_updates_description {
$section eq 'pre' and $cur->{pre} .= $_;
$section eq 'description' and $cur->{description} .= $_;
}
+ }
\%update_descr;
}