summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-30 18:38:44 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-30 18:38:44 +0000
commitd5e542943c040e0c93b3b12dac66debbf5bac0e8 (patch)
tree11fe1da28c5e2e21bdb753b931f87025ed026155
parent13e2576b7fa3e46c08a0e580b5bdd9119672f416 (diff)
downloadportage-d5e542943c040e0c93b3b12dac66debbf5bac0e8.tar.gz
portage-d5e542943c040e0c93b3b12dac66debbf5bac0e8.tar.bz2
portage-d5e542943c040e0c93b3b12dac66debbf5bac0e8.zip
Fix unmerge version spacing for bug #138611.
svn path=/main/trunk/; revision=3722
-rwxr-xr-xbin/emerge8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge
index a29dffe56..e375dc960 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2078,10 +2078,10 @@ def unmerge_overlapping(pkg_key, myroot, mysettings, vartree, ldpath_mtimes):
return pv
else:
return "%s-%s" % (pv, rev)
- selected_versions = ",".join(map(get_version, overlapping))
+ selected_versions = " ".join(map(get_version, overlapping))
protected_version = get_version(pkg_key)
if ommitted_versions:
- ommitted_versions = ", ".join(map(get_version, ommitted_versions))
+ ommitted_versions = " ".join(map(get_version, ommitted_versions))
else:
ommitted_versions = "none"
portage.writemsg_stdout("\n %s\n" % bold(mycp), noiselevel=-1)
@@ -2312,10 +2312,10 @@ def unmerge(settings, myopts, vartree, unmerge_action, unmerge_files,
myversion=mysplit[2]+"-"+mysplit[3]
if mytype=="selected":
portage.writemsg_stdout(
- colorize("UNMERGE_WARN", myversion), noiselevel=-1)
+ colorize("UNMERGE_WARN", myversion + " "), noiselevel=-1)
else:
portage.writemsg_stdout(
- colorize("GOOD", myversion), noiselevel=-1)
+ colorize("GOOD", myversion + " "), noiselevel=-1)
else:
portage.writemsg_stdout("none", noiselevel=-1)
portage.writemsg_stdout("\n", noiselevel=-1)