aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-12-06 15:50:03 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-12-06 15:50:03 +0000
commit49a69cff0c028840bc368b62505000a2d8c3eb2d (patch)
tree168f33e696ff18b67f693099e85cb14eb1c15589
parentb64d19addf3ab006c0bb11756c74254a4a16f1c8 (diff)
downloadrpmdrake-49a69cff0c028840bc368b62505000a2d8c3eb2d.tar
rpmdrake-49a69cff0c028840bc368b62505000a2d8c3eb2d.tar.gz
rpmdrake-49a69cff0c028840bc368b62505000a2d8c3eb2d.tar.bz2
rpmdrake-49a69cff0c028840bc368b62505000a2d8c3eb2d.tar.xz
rpmdrake-49a69cff0c028840bc368b62505000a2d8c3eb2d.zip
don't use {with_hdlist} directly, use a nice wrapper
-rwxr-xr-xrpmdrake4
1 files changed, 2 insertions, 2 deletions
diff --git a/rpmdrake b/rpmdrake
index 40697fb7..64b04156 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -466,7 +466,7 @@ sub extract_header {
changelog => $chg_prepro->(scalar(run_rpm("rpm -q --changelog $name"))) });
} else {
my ($p, $medium) = ($pkg->{pkg}, pkg2medium($pkg->{pkg}, $urpm));
- my $hdlist = $medium->{virtual} ? "$medium->{url}/$medium->{with_hdlist}" : "$urpm->{statedir}/$medium->{hdlist}";
+ my $hdlist = urpm::media::any_hdlist($medium);
$hdlist =~ s!^file:/+!!;
if (-r $hdlist) {
my $packer;
@@ -554,7 +554,7 @@ sub do_search($$$$$$$) {
}
} else {
my @hdlists = map {
- my $h = $_->{virtual} ? "$_->{url}/$_->{with_hdlist}" : "$urpm->{statedir}/$_->{hdlist}";
+ my $h = urpm::media::any_hdlist($_);
$h =~ s!^file:/+!!;
if_(!$_->{ignore} && ($MODE ne 'update' || $_->{update}) && -r $h, $h);
} @{$urpm->{media}};