diff options
author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-10-27 16:45:15 +0000 |
---|---|---|
committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-10-27 16:45:15 +0000 |
commit | f4d7db31562e1d8a5d418d257e58e3204c18b8b6 (patch) | |
tree | 0ec14a309344a33b465e0965472e67d5964e5d06 | |
parent | a30398817224d6e7bd6ce9e1a1cef471c1e36be5 (diff) | |
download | rpmdrake-f4d7db31562e1d8a5d418d257e58e3204c18b8b6.tar rpmdrake-f4d7db31562e1d8a5d418d257e58e3204c18b8b6.tar.gz rpmdrake-f4d7db31562e1d8a5d418d257e58e3204c18b8b6.tar.bz2 rpmdrake-f4d7db31562e1d8a5d418d257e58e3204c18b8b6.tar.xz rpmdrake-f4d7db31562e1d8a5d418d257e58e3204c18b8b6.zip |
Get rid of log.pm package
-rwxr-xr-x | rpmdrake | 10 | ||||
-rw-r--r-- | rpmdrake.pm | 1 |
2 files changed, 8 insertions, 3 deletions
@@ -375,11 +375,17 @@ sub extract_header { if (-r $hdlist) { my $packer; eval { require packdrake; $packer = new packdrake($hdlist, quiet => 1) } - or log::l("Warning, hdlist seems corrupted :-("), goto header_non_available; + or do { + warn "Warning, hdlist seems corrupted\n"; + goto header_non_available; + }; my $headersdir = chomp_(`mktemp -d /tmp/rpmdrake.XXXXXX`); -d $headersdir or die "Could not create temporary directory"; $packer->extract_archive($headersdir, $p->header_filename); - $p->update_header("$headersdir/" . $p->header_filename) or log::l("Warning, could not extract header!"), goto header_non_available; + $p->update_header("$headersdir/" . $p->header_filename) or do { + warn "Warning, could not extract header!"; + goto header_non_available; + }; rm_rf($headersdir); add2hash($pkg, { summary => rpm_summary($p->summary), description => rpm_description($p->description) }); @$max_info_in_descr and add2hash($pkg, { diff --git a/rpmdrake.pm b/rpmdrake.pm index c3d5c361..78f01b6c 100644 --- a/rpmdrake.pm +++ b/rpmdrake.pm @@ -33,7 +33,6 @@ use urpm::cfg; use URPM; use URPM::Resolve; use strict; -use log; use c; use common; |