Imported Upstream version 1.11.26

Change-Id: I74c5ca7d582437c8e842d498f2c71f1e68089bc0
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/VERSION.cmake b/VERSION.cmake
index 54ad966..301cfb5 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -34,7 +34,7 @@
 #
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "11")
-SET(VERSION_PATCH "25")
+SET(VERSION_PATCH "26")
 
-# LAST RELEASED: 1.11.25
+# LAST RELEASED: 1.11.26
 #=======

diff --git a/package/zypper.changes b/package/zypper.changes
index 02ca86b..9b27040 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue Apr  7 12:12:51 CEST 2015 - ma@suse.de
+
+- only use ANSI codes on terminals (bnc#925678)
+- version 1.11.26
+
+-------------------------------------------------------------------
 Thu Apr  2 18:25:19 CEST 2015 - ma@suse.de
 
 - Fix prompt returning undefined default value after wrong input 

diff --git a/src/utils/ansi.h b/src/utils/ansi.h
index 4bec70f..6322810 100644 (file)
--- a/src/utils/ansi.h
+++ b/src/utils/ansi.h
@@ -210,6 +210,8 @@ namespace ansi
 #else
       static const std::string _reset( "\033[0m" );
 #endif
+      static const std::string _noreset( "" );
+      if(!do_colors()) return _noreset;
       return _reset;
     }