aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2006-09-11 11:45:34 +0000
committerThierry Vignaud <tv@mandriva.org>2006-09-11 11:45:34 +0000
commit3e4d44e043adbbcfbbd94c8e3ae18cb2353056cd (patch)
treed622ae72712597a6ecef25f73fc54b11a26116da
parentfad5fd941037e53834d4a78a62c1fc4f758eec0d (diff)
downloadrpmdrake-3e4d44e043adbbcfbbd94c8e3ae18cb2353056cd.tar
rpmdrake-3e4d44e043adbbcfbbd94c8e3ae18cb2353056cd.tar.gz
rpmdrake-3e4d44e043adbbcfbbd94c8e3ae18cb2353056cd.tar.bz2
rpmdrake-3e4d44e043adbbcfbbd94c8e3ae18cb2353056cd.tar.xz
rpmdrake-3e4d44e043adbbcfbbd94c8e3ae18cb2353056cd.zip
(extract_header) always extract headers; global max_info options is now
irrelevant
-rwxr-xr-xrpmdrake3
1 files changed, 1 insertions, 2 deletions
diff --git a/rpmdrake b/rpmdrake
index 0b9750c2..bac304ce 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -411,7 +411,6 @@ sub extract_header {
};
my $name = my_fullname($pkg->{pkg});
if ($MODE eq 'remove') {
- @$max_info_in_descr or return;
add2hash($pkg, { files => [ split /\n/, chomp_(scalar(`rpm -ql $name`)) || N("(none)") ],
changelog => $chg_prepro->(to_utf8(scalar(`rpm -q --changelog $name`))) });
} else {
@@ -435,7 +434,7 @@ sub extract_header {
};
rm_rf($headersdir);
add2hash($pkg, { summary => rpm_summary($p->summary), description => rpm_description($p->description) });
- @$max_info_in_descr and add2hash($pkg, {
+ add2hash($pkg, {
files => scalar($p->files) ? [ $p->files ] : [ N("(none)") ],
changelog => $chg_prepro->(join("\n", mapn { "* " . localtime2changelog($_[2]) . " $_[0]\n\n$_[1]\n" }
[ $p->changelog_name ], [ $p->changelog_text ], [ $p->changelog_time ])) });