summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-08-11 00:50:20 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-08-11 00:50:20 +0000
commit0ad61609e606f1edb1066bd37a7a814471f00aeb (patch)
tree70a3e65b2ae3d75f7f8378f4e335f044e0a8e105
parentcac89c6aeed7865a123b828d8f90e737c89bb9f3 (diff)
downloadurpmi-0ad61609e606f1edb1066bd37a7a814471f00aeb.tar
urpmi-0ad61609e606f1edb1066bd37a7a814471f00aeb.tar.gz
urpmi-0ad61609e606f1edb1066bd37a7a814471f00aeb.tar.bz2
urpmi-0ad61609e606f1edb1066bd37a7a814471f00aeb.tar.xz
urpmi-0ad61609e606f1edb1066bd37a7a814471f00aeb.zip
Fix usage of urpmi.addmedia --distrib with distribution CDs
-rw-r--r--urpm.pm12
1 files changed, 8 insertions, 4 deletions
diff --git a/urpm.pm b/urpm.pm
index 931c593b..fcec839d 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -723,13 +723,17 @@ sub add_distrib_media {
chomp;
s/\s*#.*$//;
/^\s*$/ and next;
+ /^suppl/ and next;
m/^\s*(?:noauto:)?(hdlist\S*\.cz2?)\s+(\S+)\s*(.*)$/ or $urpm->{error}(N("invalid hdlist description \"%s\" in hdlists file"), $_);
my ($hdlist, $rpmsdir, $descr) = ($1, $2, $3);
- $urpm->add_medium($name ? "$descr ($name$medium)" : $descr,
- "$url/$rpmsdir",
- offset_pathname($url, $rpmsdir) . "/$distrib_root/$hdlist",
- %options);
+ $urpm->add_medium(
+ $name ? "$descr ($name$medium)" : $descr,
+ "$url/$rpmsdir",
+ offset_pathname($url, $rpmsdir) . "/$distrib_root/$hdlist",
+ index_name => 0,
+ %options,
+ );
++$medium;
}