summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-05-09 15:04:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-05-09 15:04:20 +0000
commitac8a12fea21114240235dc29c9d483ed70e4af15 (patch)
tree11cb56810cb28cf2f9819846f4e4a844600bd852
parenta826b77cd35b1ed611f63a0acd96276b5a615b8c (diff)
downloadurpmi-ac8a12fea21114240235dc29c9d483ed70e4af15.tar
urpmi-ac8a12fea21114240235dc29c9d483ed70e4af15.tar.gz
urpmi-ac8a12fea21114240235dc29c9d483ed70e4af15.tar.bz2
urpmi-ac8a12fea21114240235dc29c9d483ed70e4af15.tar.xz
urpmi-ac8a12fea21114240235dc29c9d483ed70e4af15.zip
urpmf: allow using hdlist on mounted cdrom
(a better fix would be to ask to mount cdrom)
-rw-r--r--urpm/media.pm4
1 files changed, 2 insertions, 2 deletions
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;