aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2002-08-05 15:41:52 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2002-08-05 15:41:52 +0000
commit2395669efc83b7289063c6a713d35b771cc8bb0f (patch)
tree90544b2600d7909cb021d115614b941223af1481
parent942c0510225efa1307f33c9e3804df25b6019d24 (diff)
downloadrpmdrake-2395669efc83b7289063c6a713d35b771cc8bb0f.tar
rpmdrake-2395669efc83b7289063c6a713d35b771cc8bb0f.tar.gz
rpmdrake-2395669efc83b7289063c6a713d35b771cc8bb0f.tar.bz2
rpmdrake-2395669efc83b7289063c6a713d35b771cc8bb0f.tar.xz
rpmdrake-2395669efc83b7289063c6a713d35b771cc8bb0f.zip
- a bit more explanations about extracting headers
- if the header couldl not be extracted, don't die, just report it as unavailable
-rwxr-xr-xrpmdrake5
1 files changed, 4 insertions, 1 deletions
diff --git a/rpmdrake b/rpmdrake
index f63ecaef..df9e0785 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -112,13 +112,16 @@ sub extract_header {
my ($headersdir, $p, $medium) = ('/root/tmp/headers/', $pkg->{pkg}, pkg2medium($pkg->{pkg}, $urpm));
my $hdlist = "$urpm->{statedir}/$medium->{hdlist}";
if (-r $hdlist) { #- packdrake segfaults when giving a missing file :(
+ standalone::explanations("Extracting header of " . $p->header_filename . " from $hdlist");
my $packer = new packdrake($hdlist, quiet => 1);
$packer->extract_archive($headersdir, $p->header_filename);
- $p->update_header($headersdir . $p->header_filename) or die('unable to open header file');
+ $p->update_header($headersdir . $p->header_filename)
+ or standalone::explanations("Warning, could not extract header!"), goto header_non_available;
rm_rf($headersdir);
add2hash($pkg, { summary => $p->summary, description => beautify_description($p->description) });
$p->pack_header;
} else {
+ header_non_available:
add2hash($pkg, { summary => _("(Non available)"), description => undef });
}
}