From ac8a12fea21114240235dc29c9d483ed70e4af15 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 9 May 2007 15:04:20 +0000 Subject: urpmf: allow using hdlist on mounted cdrom (a better fix would be to ask to mount cdrom) --- urpm/media.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'urpm') diff --git a/urpm/media.pm b/urpm/media.pm index 6005c1ae..b3c85c41 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -304,7 +304,7 @@ sub _hdlist_dir { sub _url_with_hdlist { my ($medium, $prefer_synthesis) = @_; - my $base = file_from_file_url($medium->{url}) || $medium->{url}; + my $base = file_from_local_url($medium->{url}) || $medium->{url}; $medium->{with_hdlist} ? reduce_pathname("$base/$medium->{with_hdlist}") : _hdlist_dir($medium) . "/" . _url_with_hdlist_basename($medium, $prefer_synthesis); @@ -358,7 +358,7 @@ sub any_hdlist { my ($urpm, $medium) = @_; my $f = statedir_hdlist($urpm, $medium); if ($medium->{virtual} && !$medium->{synthesis} - || !-e $f && file_from_file_url($medium->{url}) && !$medium->{synthesis} && !$medium->{hdlist}) { + || !-e $f && file_from_local_url($medium->{url}) && !$medium->{synthesis} && !$medium->{hdlist}) { $f = _url_with_hdlist($medium, ''); } -e $f && $f; -- cgit v1.2.1