summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-09-03 09:43:21 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-09-03 09:44:29 -0400
commit3c7fca264ec9f85667c9bcaa19e5d9075b8664b8 (patch)
treec1e6ca150caa6eec62a1a97653502b3575d8c6e1
parent82678294c9064f6093610a7ea062d202ba621fdf (diff)
downloadurpmi-3c7fca264ec9f85667c9bcaa19e5d9075b8664b8.tar
urpmi-3c7fca264ec9f85667c9bcaa19e5d9075b8664b8.tar.gz
urpmi-3c7fca264ec9f85667c9bcaa19e5d9075b8664b8.tar.bz2
urpmi-3c7fca264ec9f85667c9bcaa19e5d9075b8664b8.tar.xz
urpmi-3c7fca264ec9f85667c9bcaa19e5d9075b8664b8.zip
fix Term::ReadKey warnings when redirected
-rw-r--r--NEWS1
-rw-r--r--urpm/download.pm6
-rw-r--r--urpm/install.pm6
3 files changed, 9 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 92c4aa6b..aca32675 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
o fix using a proxy without an auth user (mga#11265)
- library:
o fix unmarking packages as potential orphans when downgrading (mga#16149)
+ o fix Term::ReadKey warnings when output is redirected
- testsuite:
o misc enhancements & cleanups
o fix tests for ignored faillure for %pre{,un}, %pretrans
diff --git a/urpm/download.pm b/urpm/download.pm
index c6800f73..c21caeca 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -815,11 +815,13 @@ END {
#- get the width of the terminal
my $wchar = 79;
-eval {
+if (-t STDOUT) {
+ eval {
require Term::ReadKey;
($wchar) = Term::ReadKey::GetTerminalSize();
--$wchar;
-};
+ };
+}
sub progress_text {
my ($mode, $percent, $total, $eta, $speed) = @_;
diff --git a/urpm/install.pm b/urpm/install.pm
index 08e43236..d4b83706 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -21,12 +21,14 @@ urpm::install - Package installation transaction routines for urpmi
# size of the installation progress bar
my $progress_size = 45;
-eval {
+if (-t STDOUT) {
+ eval {
require Term::ReadKey;
($progress_size) = Term::ReadKey::GetTerminalSize();
$progress_size -= 35;
$progress_size < 5 and $progress_size = 5;
-};
+ };
+}
sub _hash_intersect_list {