From d17f1ece1de5c7898e2f33ca7aa53d4a4a4a32d8 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Wed, 29 Jan 2003 11:09:33 +0000 Subject: 4.2-16mdk --- urpm.pm | 1 + urpmi.addmedia | 1 + urpmi.spec | 6 +++++- urpmi.update | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/urpm.pm b/urpm.pm index 05849dfe..111ac51d 100644 --- a/urpm.pm +++ b/urpm.pm @@ -484,6 +484,7 @@ sub read_config { $v =~ /^'([^']*)'$/ and $v = $1; $v =~ /^"([^"]*)"$/ and $v = $1; $urpm->{options}{$k} = $v; } + next; } $_ and $urpm->{error}(_("syntax error in config file at line %s", $.)); } diff --git a/urpmi.addmedia b/urpmi.addmedia index eab379d7..6451e6ff 100755 --- a/urpmi.addmedia +++ b/urpmi.addmedia @@ -118,6 +118,7 @@ and [options] are from my ($type) = $url =~ m,^([^:]*)://, or $options{distrib} or die $usage; $urpm->read_config; + exists $options{limit_rate} or $options{limit_rate} = $urpm->{options}{'limit-rate'}; if (exists $options{distrib}) { if (defined $options{distrib}) { diff --git a/urpmi.spec b/urpmi.spec index 5ade4ebd..190a09c1 100644 --- a/urpmi.spec +++ b/urpmi.spec @@ -2,7 +2,7 @@ Name: urpmi Version: 4.2 -Release: 15mdk +Release: 16mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -205,6 +205,10 @@ fi %changelog +* Wed Jan 29 2003 François Pons 4.2-16mdk +- fixed limit-rate and excludepath causing error in urpmi.cfg. +- take care of limit-rate in urpmi.update and urpmi.addmedia. + * Tue Jan 28 2003 François Pons 4.2-15mdk - fixed verify-rpm (both in urpmi.cfg or command line). - fixed default options activated. diff --git a/urpmi.update b/urpmi.update index 51c7b85e..5fb32981 100755 --- a/urpmi.update +++ b/urpmi.update @@ -77,6 +77,8 @@ where is a medium name to update. } $urpm->read_config; + exists $options{limit_rate} or $options{limit_rate} = $urpm->{options}{'limit-rate'}; + my @entries = map { $_->{name} } @{$urpm->{media}}; if ($options{all}) { -- cgit v1.2.1