summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-01-11 17:27:04 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-01-11 17:27:04 +0000
commitabe4eba4bb803bf0c0e9c756a86a53ec210a6e79 (patch)
treec672c57f772796e0375690dfb23f7383ad53f8f3
parentf12a7485de3aeb298245bd67987c520dfc40f5a8 (diff)
downloadurpmi-abe4eba4bb803bf0c0e9c756a86a53ec210a6e79.tar
urpmi-abe4eba4bb803bf0c0e9c756a86a53ec210a6e79.tar.gz
urpmi-abe4eba4bb803bf0c0e9c756a86a53ec210a6e79.tar.bz2
urpmi-abe4eba4bb803bf0c0e9c756a86a53ec210a6e79.tar.xz
urpmi-abe4eba4bb803bf0c0e9c756a86a53ec210a6e79.zip
Don't install media marked with "noauto" in the hdlists file with
urpmi.addmedia --distrib (or its rpmdrake equivalent)
-rw-r--r--urpm.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/urpm.pm b/urpm.pm
index da0880b2..76b24909 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -749,8 +749,9 @@ sub add_distrib_media {
s/\s*#.*$//;
/^\s*$/ and next;
/^(?:suppl|askmedia)/ 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);
+ m/^\s*(noauto:)?(hdlist\S*\.cz2?)\s+(\S+)\s*(.*)$/ or $urpm->{error}(N("invalid hdlist description \"%s\" in hdlists file", $_));
+ my ($noauto, $hdlist, $rpmsdir, $descr) = ($1, $2, $3);
+ next if $noauto;
push @newnames, $urpm->add_medium(
$name ? "$descr ($name$medium)" : $descr,