From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 18 Oct 2007 03:20:53 +0000 (-0000)
Subject: Adjust quote usage in collision-protect eerror
X-Git-Tag: v2.1.3.16~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cd1fc801e6982586a66ba57ca6a1ba9474b7d085;p=portage.git

Adjust quote usage in collision-protect eerror
output. (trunk r8170)

svn path=/main/branches/2.1.2/; revision=8171
---

diff --git a/pym/portage.py b/pym/portage.py
index 9aac8f5d2..cb8ac6aa1 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -8012,7 +8012,7 @@ class dblink:
 		def eerror(lines):
 			cmd = "source '%s/isolated-functions.sh' ; " % PORTAGE_BIN_PATH
 			for line in lines:
-				cmd += "eerror \"%s\" ; " % line
+				cmd += "eerror '%s' ; " % line
 			portage_exec.spawn(["bash", "-c", cmd],
 				env=self.settings.environ())
 
@@ -8026,7 +8026,7 @@ class dblink:
 				" in cases like this."
 			if self.settings.get("PORTAGE_QUIET") != "1":
 				msg += " You can use a command such as" + \
-				" \\`portageq owners / <filename>\\` to identify the" + \
+				" `portageq owners / <filename>` to identify the" + \
 				" installed package that owns a file. If portageq" + \
 				" reports that only one package owns a file then do NOT" + \
 				" file a bug report. A bug report is only useful if it" + \
@@ -8053,7 +8053,7 @@ class dblink:
 			msg.append("")
 
 			for f in collisions:
-				msg.append("     '%s'" % \
+				msg.append("\t%s" % \
 					os.path.join(destroot, f.lstrip(os.path.sep)))
 
 			eerror(msg)