From b3369bf1b86ef6ccedd73cedf1f8f4c52a19caf4 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Wed, 2 Nov 2005 16:49:55 +0000 Subject: Use MDV::Packdrakeng instead of deprecated wrapper --- urpmq | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/urpmq b/urpmq index 77a5010e..a9f80bf7 100755 --- a/urpmq +++ b/urpmq @@ -316,14 +316,16 @@ if ($urpm::args::options{list_aliases}) { @headers > 0 or next; if (-s "$urpm->{statedir}/$urpm->{media}[$_]{hdlist}") { - require packdrake; - my $packer = new packdrake( - $urpm->{media}[$_]{virtual} + require MDV::Packdrakeng; + my $packer = MDV::Packdrakeng->new( + archive => ( + $urpm->{media}[$_]{virtual} ? ("$urpm->{media}[$_]{url}/$urpm->{media}[$_]{with_hdlist}" =~ m!^(?:file:/*)?(/[^/].*)!)[0] : "$urpm->{statedir}/$urpm->{media}[$_]{hdlist}", + ), quiet => 1, ); - $packer->extract_archive(undef, @headers); + $packer->extract(undef, @headers); } else { #- fallback to retrieve rpm package before, so that --headers will be ok. my %downloads = $urpm->download_source_packages({}, $list, force_local => 1); @@ -353,9 +355,9 @@ if ($urpm::args::options{list_aliases}) { ? ("$urpm->{media}[$_]{url}/$urpm->{media}[$_]{with_hdlist}" =~ m!^(?:file:/*)?(/[^/].*)!)[0] : "$urpm->{statedir}/$urpm->{media}[$_]{hdlist}"; if (-s $hdlist_path) { - require packdrake; - my $packer = new packdrake($hdlist_path, quiet => 1); - $packer->extract_archive($tmp_header_dir, @headers); + require MDV::Packdrakeng; + my $packer = MDV::Packdrakeng->new(archive => $hdlist_path, quiet => 1); + $packer->extract($tmp_header_dir, @headers); } elsif (!%downloads) { #- fallback to retrieve rpm package before, so that --headers will be ok. %downloads = $urpm->download_source_packages({}, $list, force_local => 1); -- cgit v1.2.1