From 61d3e9740baa90dd2f78028500b8152de45dbcd6 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Wed, 8 Feb 2006 17:13:39 +0000 Subject: Use stdout for informational messages, not stderr --- urpmf | 6 +++--- urpmi | 6 +++--- urpmq | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/urpmf b/urpmf index 4f8762c6..ed9d218b 100755 --- a/urpmf +++ b/urpmf @@ -3,7 +3,7 @@ # $Id$ #- Copyright (C) 2002, 2003, 2004, 2005 MandrakeSoft SA -#- Copyright (C) 2005 Mandriva SA +#- Copyright (C) 2005, 2006 Mandriva SA #- #- This program is free software; you can redistribute it and/or modify #- it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ use urpm::msg; sub usage { print N("urpmf version %s -Copyright (C) 2002-2005 Mandriva. +Copyright (C) 2002-2006 Mandriva. This is free software and may be redistributed under the terms of the GNU GPL. usage: urpmf [options] pattern-expression @@ -170,7 +170,7 @@ if ($@) { } if ($env) { - print STDERR N("using specific environment on %s\n", $env); + print N("using specific environment on %s\n", $env); #- setting new environment. $urpm->{config} = "$env/urpmi.cfg"; $urpm->{skiplist} = "$env/skip.list"; diff --git a/urpmi b/urpmi index 7456fec0..6dd0cf08 100755 --- a/urpmi +++ b/urpmi @@ -226,7 +226,7 @@ if ($bug) { if ($env) { -d $env or $urpm->{fatal}(8, N("Environment directory %s does not exist", $env)); - warn N("using specific environment on %s\n", $env); + print N("using specific environment on %s\n", $env); $logfile = "$env/urpmi_env.log"; unlink $logfile; #- setting new environment. @@ -530,11 +530,11 @@ if ($env) { : N("To satisfy dependencies, the following package is going to be installed"); my $msg2 = N("(%d packages, %d MB)", $urpm->{nb_install}, toMb($sum)); my $p = join "\n", @to_install; - warn "$msg:\n$p\n$msg2\n"; + print "$msg:\n$p\n$msg2\n"; exit 0; #- exit now for specific environment. } if (@root_only) { - warn N("You need to be root to install the following dependencies:\n%s\n", join ' ', @root_only); + print N("You need to be root to install the following dependencies:\n%s\n", join ' ', @root_only); exit 1; } elsif (!$urpm->{options}{auto} && $ask_user && @to_install) { my $msg = $#to_install diff --git a/urpmq b/urpmq index a4ae3efc..b3af9103 100755 --- a/urpmq +++ b/urpmq @@ -37,7 +37,7 @@ our @src_names; sub usage { print N("urpmq version %s -Copyright (C) 2000-2005 Mandriva. +Copyright (C) 2000-2006 Mandriva. This is free software and may be redistributed under the terms of the GNU GPL. usage: @@ -122,7 +122,7 @@ $urpm::args::options{nodepslist} = $urpm::args::options{list_aliases} $urpm::args::options{nolock} = 1 if $urpm::args::options{nodepslist}; if ($urpm::args::options{env}) { - print STDERR N("using specific environment on %s\n", $urpm::args::options{env}); + print N("using specific environment on %s\n", $urpm::args::options{env}); #- setting new environment. $urpm->{config} = "$urpm::args::options{env}/urpmi.cfg"; $urpm->{skiplist} = "$urpm::args::options{env}/skip.list"; -- cgit v1.2.1