diff options
author | Francois Pons <fpons@mandriva.com> | 2002-08-13 10:14:05 +0000 |
---|---|---|
committer | Francois Pons <fpons@mandriva.com> | 2002-08-13 10:14:05 +0000 |
commit | 126d912d2cf81dee5c0d897adc72c79105b4c14e (patch) | |
tree | a46600b038d1e9e326ece79abc4c0b79b72282f8 | |
parent | e2111ccdf3ddc3c907f58feb0a25f5f92bd03194 (diff) | |
download | urpmi-126d912d2cf81dee5c0d897adc72c79105b4c14e.tar urpmi-126d912d2cf81dee5c0d897adc72c79105b4c14e.tar.gz urpmi-126d912d2cf81dee5c0d897adc72c79105b4c14e.tar.bz2 urpmi-126d912d2cf81dee5c0d897adc72c79105b4c14e.tar.xz urpmi-126d912d2cf81dee5c0d897adc72c79105b4c14e.zip |
ignore noauto medium from Mandrake distribution (--distrib).
-rw-r--r-- | urpm.pm | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -667,7 +667,7 @@ sub add_distrib_media { chomp; s/\s*#.*$//; /^\s*$/ and next; - m/^\s*(hdlist\S*\.cz2?)\s+(\S+)\s*(.*)$/ or $urpm->{error}(_("invalid hdlist description \"%s\" in hdlists file"), $_); + m/^\s*(?:noauto:)?(hdlist\S*\.cz2?)\s+(\S+)\s*(.*)$/ or $urpm->{error}(_("invalid hdlist description \"%s\" in hdlists file"), $_); my ($hdlist, $rpmsdir, $descr) = ($1, $2, $3); $urpm->add_medium($name ? "$descr ($name$medium)" : $descr, "$url/$rpmsdir", "../base/$hdlist", %options); |