summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-11-09 22:32:13 +0000
committerZac Medico <zmedico@gentoo.org>2008-11-09 22:32:13 +0000
commitf446548a24e6e16e170b8995d94c3d3f79bc6d0d (patch)
tree3fb376a66fb21212e0a8d866e8c363d10b22f1c3
parent8429cad5332f22cc6c80cad87bc532508371916e (diff)
downloadportage-f446548a24e6e16e170b8995d94c3d3f79bc6d0d.tar.gz
portage-f446548a24e6e16e170b8995d94c3d3f79bc6d0d.tar.bz2
portage-f446548a24e6e16e170b8995d94c3d3f79bc6d0d.zip
Make show_invalid_depstring_notice() send output to stderr via writemsg_level().
svn path=/main/trunk/; revision=11840
-rw-r--r--pym/_emerge/__init__.py17
1 files changed, 5 insertions, 12 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 804afb3f7..564a6d5fb 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -3998,14 +3998,8 @@ def show_invalid_depstring_notice(parent_node, depstring, error_msg):
from formatter import AbstractFormatter, DumbWriter
f = AbstractFormatter(DumbWriter(maxcol=72))
- print "\n\n!!! Invalid or corrupt dependency specification: "
- print
- print error_msg
- print
- print parent_node
- print
- print depstring
- print
+ msg1 = "\n\n!!! Invalid or corrupt dependency specification: " + \
+ "\n\n%s\n\n%s\n\n%s\n\n" % (error_msg, parent_node, depstring)
p_type, p_root, p_key, p_status = parent_node
msg = []
if p_status == "nomerge":
@@ -4020,13 +4014,12 @@ def show_invalid_depstring_notice(parent_node, depstring, error_msg):
msg.append("the problematic dependencies can be found in the ")
msg.append("*DEPEND files located in '%s/'." % pkg_location)
else:
- msg.append("This package can not be installed. ")
+ msg.append("This package can not be installed. ")
msg.append("Please notify the '%s' package maintainer " % p_key)
msg.append("about this problem.")
- for x in msg:
- f.add_flowing_data(x)
- f.end_paragraph(1)
+ msg2 = "".join("%s\n" % line for line in textwrap.wrap("".join(msg), 72))
+ writemsg_level(msg1 + msg2, level=logging.ERROR, noiselevel=-1)
class PackageVirtualDbapi(portage.dbapi):
"""