summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-04-20 09:05:15 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-04-20 09:05:15 +0000
commit668d54454c118beb0db294717ee3a9c23b1b7ab8 (patch)
tree9a746bf367371ea37c0015c8dbafe996974d7f73
parent22d3107b3224f91c04e8825ba8bc812dba63a7ef (diff)
downloadurpmi-668d54454c118beb0db294717ee3a9c23b1b7ab8.tar
urpmi-668d54454c118beb0db294717ee3a9c23b1b7ab8.tar.gz
urpmi-668d54454c118beb0db294717ee3a9c23b1b7ab8.tar.bz2
urpmi-668d54454c118beb0db294717ee3a9c23b1b7ab8.tar.xz
urpmi-668d54454c118beb0db294717ee3a9c23b1b7ab8.zip
Fix regressions due to modularization
-rw-r--r--urpm/msg.pm8
-rwxr-xr-xurpmi2
2 files changed, 5 insertions, 5 deletions
diff --git a/urpm/msg.pm b/urpm/msg.pm
index 5e367daa..fb5264c7 100644
--- a/urpm/msg.pm
+++ b/urpm/msg.pm
@@ -23,8 +23,8 @@ sub N {
sub log_it {
#- if invoked as a simple user, nothing should be logged.
- if (our $log) {
- open my $fh, ">>$log" or die "can't output to log file: $!\n";
+ if ($::log) {
+ open my $fh, ">>$::log" or die "can't output to log file: $!\n";
print $fh @_;
close $fh;
}
@@ -58,7 +58,7 @@ sub message_input {
if ($urpm::args::options{bug}) {
print STDOUT $msg;
} else {
- print SAVEOUT $msg;
+ print ::SAVEOUT $msg;
}
if ($default_input) {
$urpm::args::options{bug} and log_it($default_input);
@@ -89,7 +89,7 @@ sub message {
if ($urpm::args::options{bug}) {
print STDOUT "$msg\n";
} else {
- print SAVEOUT "$msg\n";
+ print ::SAVEOUT "$msg\n";
}
}
}
diff --git a/urpmi b/urpmi
index 66d312da..dbf02480 100755
--- a/urpmi
+++ b/urpmi
@@ -54,7 +54,7 @@ our $rpm_opt = "vh";
our $use_provides = 1;
our $verbose = 0;
our $usedistrib = 0;
-my $log = '';
+our $log = '';
my $uid;
my @files;