fix "" " " bug

svn path=/main/trunk/; revision=5601

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index ca07f8795d4212ec5135a03f60d290373ac34fc3..28a2a36c240e4c34dc4a905e8b45c9b910f7f2e8 100755 (executable)
--- 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 965750c12acd1de4d5a8065e51162d0101ad13a5..2c64770634b9094bfc363ad41b90f413280e86f0 100755 (executable)
--- 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):