summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-09-14 13:02:31 +0000
committerThierry Vignaud <tv@mandriva.org>2007-09-14 13:02:31 +0000
commit0a267014dfaf585ba8463724114cd5abf024cdad (patch)
tree66f8ad83f73d5691ce5e8e628cd5d5ae59b4a02b
parent50dcf0b5b62f3d1309e660491741cabfab524a85 (diff)
downloadurpmi-0a267014dfaf585ba8463724114cd5abf024cdad.tar
urpmi-0a267014dfaf585ba8463724114cd5abf024cdad.tar.gz
urpmi-0a267014dfaf585ba8463724114cd5abf024cdad.tar.bz2
urpmi-0a267014dfaf585ba8463724114cd5abf024cdad.tar.xz
urpmi-0a267014dfaf585ba8463724114cd5abf024cdad.zip
(get_updates_description) index by medium then by package ; we
previously only index by raw package name (w/o version and w/o arch) which resulted in packages being overwritten (ie on a biarch, we would only saw one of both ia32 & x86_64 packages)
-rw-r--r--NEWS2
-rw-r--r--urpm.pm2
-rwxr-xr-xurpmq2
3 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 91ff11a9..64c81034 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- improve retrieving update descriptions API
+
Version 4.10.9 - 13 September 2007, by Pascal "Pixel" Rigaux
- urpmi, urpme
diff --git a/urpm.pm b/urpm.pm
index 9241ddb2..f75da88b 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -257,7 +257,7 @@ sub get_updates_description {
if (exists $cur->{importance} && !member($cur->{importance}, qw(security bugfix))) {
$cur->{importance} = 'normal';
}
- $update_descr{$_} = $cur foreach @{$cur->{pkgs} || []};
+ $update_descr{$medium->{name}}{$_} = $cur foreach @{$cur->{pkgs} || []};
$cur = { pkgs => [ split /\s/, $1 ], medium => $medium->{name} };
$section = 'pkg';
next;
diff --git a/urpmq b/urpmq
index 3db4cdb1..eb66e9b4 100755
--- a/urpmq
+++ b/urpmq
@@ -394,7 +394,7 @@ if ($options{list_aliases}) {
$pkg->packager and printf "%-12s: %s\n", "Packager", $pkg->packager;
$pkg->url and printf "%-12s: %s\n", "URL", $pkg->url;
$pkg->summary and printf "%-12s: %s\n", "Summary", $pkg->summary;
- my $updesc = $updates_descr->{$pkg->name};
+ my $updesc = $updates_descr->{URPM::pkg2media($urpm->{media}, $pkg)->{name}}{$pkg->name};
$pkg->description && !$updesc->{description}
and printf "%-12s:\n%s\n", "Description", $pkg->description;
if ($updesc) {