From 7b04b921448de9d4841c0dffd36e0195a96e3e1f Mon Sep 17 00:00:00 2001
From: guinux <nuxgui@gmail.com>
Date: Wed, 5 Mar 2014 15:16:51 +0100
Subject: [PATCH] manually merge request #1

---
 pamac-manager.py     | 2 +-
 pamac/transaction.py | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pamac-manager.py b/pamac-manager.py
index d76e317..4d9141a 100755
--- a/pamac-manager.py
+++ b/pamac-manager.py
@@ -18,7 +18,7 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-version = '0.9.7'
+version = '0.9.8'
 
 from gi.repository import Gtk, Gdk
 import pyalpm
diff --git a/pamac/transaction.py b/pamac/transaction.py
index 5e513ed..7ff89a9 100644
--- a/pamac/transaction.py
+++ b/pamac/transaction.py
@@ -30,6 +30,7 @@ import fnmatch
 import dbus
 from dbus.mainloop.glib import DBusGMainLoop
 import signal
+import re
 
 from pamac import config, common, aur
 
@@ -51,6 +52,7 @@ build_depends = set()
 handle = None
 syncdbs = None
 localdb = None
+colors_regexp = re.compile('\\033\[(\d;)?\d*m')
 
 # i18n
 import gettext
@@ -492,6 +494,7 @@ def check_finished_build(data):
 		signal.setitimer(signal.ITIMER_REAL, 0.05) # 50 ms timeout
 		try:
 			line = build_proc.stdout.readline().decode(encoding='UTF-8')
+			line = re.sub(colors_regexp, '', line)
 			#print(line.rstrip('\n'))
 			progress_buffer.insert_at_cursor(line)
 		except Exception: