summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-05-12 09:39:51 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-05-12 09:39:51 +0000
commitcef4e2bc9de96274155b91359e9829e28b80fb18 (patch)
treef71b746ba35ff18402d8aeb74a6dbf38e954c283
parent9b571e0095c6ca8a97df7144ca4db3bd92514733 (diff)
downloadurpmi-cef4e2bc9de96274155b91359e9829e28b80fb18.tar
urpmi-cef4e2bc9de96274155b91359e9829e28b80fb18.tar.gz
urpmi-cef4e2bc9de96274155b91359e9829e28b80fb18.tar.bz2
urpmi-cef4e2bc9de96274155b91359e9829e28b80fb18.tar.xz
urpmi-cef4e2bc9de96274155b91359e9829e28b80fb18.zip
Fix urpmq -i with local RPMs
-rw-r--r--NEWS2
-rwxr-xr-xurpmq13
2 files changed, 10 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 3ca99532..83ad0002 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@
signatures when the same package is available from different media
- urpmi_rpm-find-leaves
o do not list suggested packages as unrequested packages (#46326)
+- urpmq
+ o fix urpmq -i on local RPMs
Version 6.14.13 - 15 December 2008
diff --git a/urpmq b/urpmq
index 1057c3ba..0d0b6ddd 100755
--- a/urpmq
+++ b/urpmq
@@ -442,12 +442,15 @@ 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->{URPM::pkg2media($urpm->{media}, $pkg)->{name}}{$pkg->name};
- $pkg->description && !$updesc->{description}
- and printf "%-12s:\n%s\n", "Description", $pkg->description;
+
+ my $updesc = do {
+ my $media = URPM::pkg2media($urpm->{media}, $pkg);
+ $media && $updates_descr->{$media->{name}}{$pkg->name};
+ };
+ if (my $description = ($updesc && $updesc->{description}) || $pkg->description) {
+ printf "%-12s:\n%s\n", "Description", $description;
+ }
if ($updesc) {
- $updesc->{description}
- and printf "%-12s:\n%s\n", "Description", $updesc->{description};
$updesc->{updated}
and printf "%-20s: %s\n", "Last updated", $updesc->{updated};
$updesc->{importance}