From: Zac Medico Date: Sat, 13 Oct 2007 17:48:01 +0000 (-0000) Subject: In the file collision eerror output, don't colorize the X-Git-Tag: v2.1.3.16~35 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=50aba8dbfbd7dd61201e71d4863e16f09ffada58;p=portage.git In the file collision eerror output, don't colorize the file paths since the escape codes look ugly in the log. (trunk r8113:8115) svn path=/main/branches/2.1.2/; revision=8116 --- diff --git a/pym/portage.py b/pym/portage.py index 29a3075ba..380f2e3ef 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -8057,10 +8057,9 @@ class dblink: cmd += "eerror \"Detected file collision(s):\" ; " cmd += "eerror ; " - from output import colorize for f in collisions: - cmd += "eerror \" '%s'\" ; " % colorize("INFORM", - os.path.join(destroot, f.lstrip(os.path.sep))) + cmd += "eerror \" '%s'\" ; " % \ + os.path.join(destroot, f.lstrip(os.path.sep)) portage_exec.spawn(["bash", "-c", cmd], env=self.settings.environ())