summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-01-17 15:56:52 +0000
committerFrancois Pons <fpons@mandriva.com>2001-01-17 15:56:52 +0000
commit26da3775375d12a7378454660510eabecb55c611 (patch)
tree8048e4e6236df85362fbb23256382440e7694a15
parent539b8ae6cb14b33ef9e976b7a359b2440c8fa333 (diff)
downloadurpmi-26da3775375d12a7378454660510eabecb55c611.tar
urpmi-26da3775375d12a7378454660510eabecb55c611.tar.gz
urpmi-26da3775375d12a7378454660510eabecb55c611.tar.bz2
urpmi-26da3775375d12a7378454660510eabecb55c611.tar.xz
urpmi-26da3775375d12a7378454660510eabecb55c611.zip
fixed glitches when reading old urpmi.cfg file.
-rw-r--r--urpm.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/urpm.pm b/urpm.pm
index cf7cf3e6..bd35a4b2 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -93,7 +93,7 @@ sub read_config {
open F, $urpm->{config}; #- no filename can be allowed on some case
while (<F>) {
chomp; s/#.*$//; s/\s*$//;
- /^\s*(.*?[^\\])\s+(?:(.*?[^\\])\s+)?\{$/ and do { #- urpmi.cfg format extention
+ /^\s*(.*?[^\\])\s+(?:(.*?[^\\])\s+)?{$/ and do { #- urpmi.cfg format extention
my $medium = { name => unquotespace($1), clear_url => unquotespace($2) };
while (<F>) {
chomp; s/#.*$//; s/\s*$//;
@@ -114,7 +114,7 @@ sub read_config {
$urpm->probe_medium($medium);
push @{$urpm->{media}}, $medium;
next; };
- /^\s+(.*?[^\\])\s+(?:(.*?[^\\])\s*)$/ and do { #- urpmi.cfg old format (assume hdlist.<name>.cz2?)
+ /^\s*(.*?[^\\])\s+(?:(.*?[^\\])\s*)?$/ and do { #- urpmi.cfg old format (assume hdlist.<name>.cz2?)
my $medium = { name => unquotespace($1), clear_url => unquotespace($2) };
$urpm->probe_medium($medium);
push @{$urpm->{media}}, $medium;