From d584c4b6509aab1bed3ca7bf2281f914f1ece8f0 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 18 Oct 2007 03:20:16 +0000 Subject: [PATCH] Adjust quote usage in collision-protect eerror output. svn path=/main/trunk/; revision=8170 --- pym/portage/dbapi/vartree.py | 6 +++--- 1 file 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 / \\` to identify the" + \ + " `portageq owners / ` 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) -- 2.26.2