aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-06-13 06:27:19 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-06-13 06:27:19 +0000
commit3462c3cba05c3203fcbc83e88760804031e5f610 (patch)
treee7deb4fa498cde97d469f38d69aa7fc7d5e5247b
parent2120972471cfc09fb0ab1786283b471bb00ba2b4 (diff)
downloadrpmdrake-3462c3cba05c3203fcbc83e88760804031e5f610.tar
rpmdrake-3462c3cba05c3203fcbc83e88760804031e5f610.tar.gz
rpmdrake-3462c3cba05c3203fcbc83e88760804031e5f610.tar.bz2
rpmdrake-3462c3cba05c3203fcbc83e88760804031e5f610.tar.xz
rpmdrake-3462c3cba05c3203fcbc83e88760804031e5f610.zip
Don't overwrite good descriptions from hdlists with empty descriptions from synthesis
-rwxr-xr-xrpmdrake24
1 files changed, 13 insertions, 11 deletions
diff --git a/rpmdrake b/rpmdrake
index d7e0d140..9f28e37d 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -1709,17 +1709,19 @@ sub get_installed_pkgs {
}
my %installed_pkgs;
$db->traverse(sub {
- my ($pkg) = @_;
- my $fullname = my_fullname($pkg);
- if (!$base{$fullname} || ${$base{$fullname}} != 1) {
- #- I need to extract summary and description since they'll be lost when $pkg->pack_header
- $installed_pkgs{$fullname} = { selected => 0, pkg => $pkg, urpm_name => urpm_name($pkg),
- summary => rpm_summary($pkg->summary),
- description => rpm_description($pkg->description) };
- $base{$fullname} and $installed_pkgs{$fullname}{base} = \${$base{$fullname}};
- }
- $pkg->pack_header;
- });
+ my ($pkg) = @_;
+ my $fullname = my_fullname($pkg);
+ if (!$base{$fullname} || ${$base{$fullname}} != 1) {
+ #- I need to extract summary and description since they'll be lost when $pkg->pack_header
+ $installed_pkgs{$fullname} = {
+ selected => 0, pkg => $pkg, urpm_name => urpm_name($pkg),
+ summary => rpm_summary($pkg->summary),
+ description => rpm_description($pkg->description),
+ } unless $installed_pkgs{$fullname} && $installed_pkgs{$fullname}{description};
+ $base{$fullname} and $installed_pkgs{$fullname}{base} = \${$base{$fullname}};
+ }
+ $pkg->pack_header;
+ });
remove_wait_msg($wait);
my $urpm = urpm->new;
my $group;