diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-03-01 21:27:29 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-03-01 21:27:29 +0000 |
commit | df370f634d8a2deec3a1650b1a8aa267fde25849 (patch) | |
tree | 8f2c059e9d511184b41fe5ecfc61021ed1f1f5e7 | |
parent | Make sure pids are appropriately removed from portage_exec.spawned_pids. (tru... (diff) | |
download | portage-df370f634d8a2deec3a1650b1a8aa267fde25849.tar.gz portage-df370f634d8a2deec3a1650b1a8aa267fde25849.tar.bz2 portage-df370f634d8a2deec3a1650b1a8aa267fde25849.zip |
Merge --quiet fixes from trunk r6112:6113
svn path=/main/branches/2.1.2/; revision=6114
-rwxr-xr-x | bin/emerge | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge index b56eeb330..de8e90cf9 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3424,7 +3424,7 @@ def unmerge(settings, myopts, vartree, unmerge_action, unmerge_files, # ok, now the last-merged package # is protected, and the rest are selected if global_unmerge and not numselected: - print "\n>>> No outdated packages were found on your system.\n" + portage.writemsg_stdout("\n>>> No outdated packages were found on your system.\n") return 0 if not numselected: @@ -3545,9 +3545,9 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval): regen_infodirs.append(inforoot) if not regen_infodirs: - print " "+green("*")+" GNU info directory index is up-to-date." + portage.writemsg_stdout(" "+green("*")+" GNU info directory index is up-to-date.\n") else: - print " "+green("*")+" Regenerating GNU info directory index..." + portage.writemsg_stdout(" "+green("*")+" Regenerating GNU info directory index...\n") icount=0 badcount=0 @@ -4873,7 +4873,7 @@ def action_build(settings, trees, mtimedb, if mtimedb.has_key("resume"): del mtimedb["resume"] if settings["AUTOCLEAN"] and "yes"==settings["AUTOCLEAN"]: - print ">>> Auto-cleaning packages..." + portage.writemsg_stdout(">>> Auto-cleaning packages...\n") vartree = trees[settings["ROOT"]]["vartree"] unmerge(settings, myopts, vartree, "clean", ["world"], ldpath_mtimes, autoclean=1) |