summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-07-23 01:33:20 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-07-23 01:33:20 +0000
commit22ff7d6aefd8ad6cd9d72c825030189187a9d4cc (patch)
treefd76228d154b0886fa988f7e476e1470474c7d5d
parent5a7853797a154a77ae8013ad676cbdf61c58e70f (diff)
downloadurpmi-22ff7d6aefd8ad6cd9d72c825030189187a9d4cc.tar
urpmi-22ff7d6aefd8ad6cd9d72c825030189187a9d4cc.tar.gz
urpmi-22ff7d6aefd8ad6cd9d72c825030189187a9d4cc.tar.bz2
urpmi-22ff7d6aefd8ad6cd9d72c825030189187a9d4cc.tar.xz
urpmi-22ff7d6aefd8ad6cd9d72c825030189187a9d4cc.zip
Hmm, syntax error
-rw-r--r--urpm.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/urpm.pm b/urpm.pm
index 7282c685..6edac54e 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -654,11 +654,11 @@ sub add_distrib_media {
# (Olivier Thauvin): Is this a workaround ?
$urpm->{media} or $urpm->read_config;
- #- be compatible with pre-10.1 layout
- -d "$dir/$distrib_root" or $distrib_root = "Mandrake/base";
-
#- try to copy/retrieve the hdlists file.
if (my ($dir) = $url =~ m!^(?:removable[^:]*|file):/(.*)!) {
+ #- be compatible with pre-10.1 layout
+ -d "$dir/$distrib_root" or $distrib_root = "Mandrake/base";
+
$hdlists_file = reduce_pathname("$dir/$distrib_root/hdlists");
$urpm->try_mounting($hdlists_file) or $urpm->{error}(N("unable to access first installation medium")), return;