summaryrefslogtreecommitdiffstats
path: root/urpm/media.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-05-15 14:04:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-05-15 14:04:08 +0000
commitad267f63d66ffe9455591bc326c376709b8f08b8 (patch)
tree612e61ecd1cbace8c4f97bdef64c9e4ab784bdc9 /urpm/media.pm
parentd8b4bc529b8512223dc7ae3c80c5131257658402 (diff)
downloadurpmi-ad267f63d66ffe9455591bc326c376709b8f08b8.tar
urpmi-ad267f63d66ffe9455591bc326c376709b8f08b8.tar.gz
urpmi-ad267f63d66ffe9455591bc326c376709b8f08b8.tar.bz2
urpmi-ad267f63d66ffe9455591bc326c376709b8f08b8.tar.xz
urpmi-ad267f63d66ffe9455591bc326c376709b8f08b8.zip
display "reconfiguring urpmi" only if the reconfig.urpmi magic is found
Diffstat (limited to 'urpm/media.pm')
-rw-r--r--urpm/media.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/urpm/media.pm b/urpm/media.pm
index 5d788f5a..2769c33d 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -998,12 +998,12 @@ sub reconfig_urpmi {
my ($urpm, $rfile, $medium) = @_;
-r $rfile or return;
- $urpm->{log}(N("reconfiguring urpmi for media \"%s\"", $medium->{name}));
-
my ($magic, @lines) = cat_($rfile);
#- the first line of reconfig.urpmi must be magic, to be sure it's not an error file
$magic =~ /^# this is an urpmi reconfiguration file/ or return undef;
+ $urpm->{log}(N("reconfiguring urpmi for media \"%s\"", $medium->{name}));
+
my @replacements;
foreach (@lines) {
chomp;