From 724bd436f4be948f43c6496683fd7b7bef63da95 Mon Sep 17 00:00:00 2001 From: Alec Warner Date: Fri, 12 Jan 2007 08:55:24 +0000 Subject: fix "" " " bug svn path=/main/trunk/; revision=5601 --- bin/dispatch-conf | 2 +- bin/emerge | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/dispatch-conf b/bin/dispatch-conf index ca07f8795..28a2a36c2 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -362,6 +362,6 @@ d = dispatch () if len(sys.argv) > 1: # for testing - d.grind ("".join( (sys.argv [1:])) + d.grind (" ".join( (sys.argv [1:])) else: d.grind (portage.settings ['CONFIG_PROTECT']) diff --git a/bin/emerge b/bin/emerge index 965750c12..2c6477063 100755 --- a/bin/emerge +++ b/bin/emerge @@ -585,7 +585,7 @@ def getlist(settings, mode): raise mynewlines=[] for x in mylines: - myline="".join(x.split()) + myline=" ".join(x.split()) if not len(myline): continue elif myline[0]=="#": @@ -2628,7 +2628,7 @@ class depgraph: for arg in self._pprovided_args: msg.append(" " + arg + "\n") msg.append("\n") - sys.stderr.write("".join(msg)) + sys.stderr.write(" ".join(msg)) def calc_changelog(self,ebuildpath,current,next): current = '-'.join(portage.catpkgsplit(current)[1:]) @@ -2737,7 +2737,7 @@ class PackageCounters(object): if self.restrict_fetch_satisfied < self.restrict_fetch: myoutput.append(bad(" (%s unsatisfied)") % \ (self.restrict_fetch - self.restrict_fetch_satisfied)) - return "".join(myoutput) + return " ".join(myoutput) class MergeTask(object): -- cgit v1.2.3-1-g7c22