From 0a267014dfaf585ba8463724114cd5abf024cdad Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 14 Sep 2007 13:02:31 +0000 Subject: (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) --- NEWS | 2 ++ urpm.pm | 2 +- urpmq | 2 +- 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) { -- cgit v1.2.1