summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2007-01-12 08:55:24 +0000
committerAlec Warner <antarus@gentoo.org>2007-01-12 08:55:24 +0000
commit724bd436f4be948f43c6496683fd7b7bef63da95 (patch)
tree1c4be8ae729532d41aa9f15d13fcd15e55ad552a /bin
parentpurge string module from emerge (diff)
downloadportage-multirepo-724bd436f4be948f43c6496683fd7b7bef63da95.tar.gz
portage-multirepo-724bd436f4be948f43c6496683fd7b7bef63da95.tar.bz2
portage-multirepo-724bd436f4be948f43c6496683fd7b7bef63da95.zip
fix "" " " bug
svn path=/main/trunk/; revision=5601
Diffstat (limited to 'bin')
-rwxr-xr-xbin/dispatch-conf2
-rwxr-xr-xbin/emerge6
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index ca07f879..28a2a36c 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 965750c1..2c647706 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):