summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-10-18 03:20:16 +0000
committerZac Medico <zmedico@gentoo.org>2007-10-18 03:20:16 +0000
commitd584c4b6509aab1bed3ca7bf2281f914f1ece8f0 (patch)
treeade7c7a1ac814f78cd2c7ebef42fc2f30544743d
parent147359cb7a67a720b810097e40f36719a7a0db1b (diff)
downloadportage-d584c4b6509aab1bed3ca7bf2281f914f1ece8f0.tar.gz
portage-d584c4b6509aab1bed3ca7bf2281f914f1ece8f0.tar.bz2
portage-d584c4b6509aab1bed3ca7bf2281f914f1ece8f0.zip
Adjust quote usage in collision-protect eerror
output. svn path=/main/trunk/; revision=8170
-rw-r--r--pym/portage/dbapi/vartree.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 3151f801b..466a06dcc 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1751,7 +1751,7 @@ class dblink(object):
def eerror(lines):
cmd = "source '%s/isolated-functions.sh' ; " % PORTAGE_BIN_PATH
for line in lines:
- cmd += "eerror \"%s\" ; " % line
+ cmd += "eerror '%s' ; " % line
from portage import process
process.spawn(["bash", "-c", cmd],
env=self.settings.environ())
@@ -1766,7 +1766,7 @@ class dblink(object):
" 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" + \
@@ -1793,7 +1793,7 @@ class dblink(object):
msg.append("")
for f in collisions:
- msg.append(" '%s'" % \
+ msg.append("\t%s" % \
os.path.join(destroot, f.lstrip(os.path.sep)))
eerror(msg)