From abe4eba4bb803bf0c0e9c756a86a53ec210a6e79 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Tue, 11 Jan 2005 17:27:04 +0000 Subject: Don't install media marked with "noauto" in the hdlists file with urpmi.addmedia --distrib (or its rpmdrake equivalent) --- urpm.pm | 5 +++-- 1 file 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, -- cgit v1.2.1