diff options
| -rwxr-xr-x | bin/emerge | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/bin/emerge b/bin/emerge index 53cd0824e..6c8b7eb87 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1025,22 +1025,26 @@ class depgraph: already been selected) will be required in order to handle all possible cases.""" - from formatter import AbstractFormatter, DumbWriter - f = AbstractFormatter(DumbWriter(maxcol=72)) - - print "\n!!! Multiple versions within a single " + \ - "package slot have been " - print "!!! pulled into the dependency graph:" - print + msg = [] + msg.append("\n!!! Multiple versions within a single " + \ + "package slot have been \n") + msg.append("!!! pulled into the dependency graph:\n\n") for node, parents in packages: - print node, + msg.append(str(node)) if parents: - print "pulled in by" + msg.append(" pulled in by\n") for parent in parents: - print " ", parent + msg.append(" ") + msg.append(str(parent)) + msg.append("\n") else: - print "(no parents)" - print + msg.append(" (no parents)\n") + msg.append("\n") + sys.stderr.write("".join(msg)) + sys.stderr.flush() + + if "--quiet" in self.myopts: + return msg = [] msg.append("It may be possible to solve this problem ") @@ -1052,6 +1056,8 @@ class depgraph: msg.append("the dependencies of two different packages, then those ") msg.append("packages can not be installed simultaneously.") + from formatter import AbstractFormatter, DumbWriter + f = AbstractFormatter(DumbWriter(sys.stderr, maxcol=72)) for x in msg: f.add_flowing_data(x) f.end_paragraph(1) @@ -1063,6 +1069,7 @@ class depgraph: for x in msg: f.add_flowing_data(x) f.end_paragraph(1) + f.writer.flush() def create(self, mybigkey, myparent=None, addme=1, myuse=None, priority=DepPriority(), rev_dep=False, arg=None): |