From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 9 Jan 2010 15:05:08 +0000 (-0000)
Subject:    Merged from trunk -r15178:15180
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=28a4e0d37c1d66f5e5207b4bfc19ea75cc42f9c2;p=portage.git

   Merged from trunk -r15178:15180

   | 15179   | Skip global updates for help, version, and info actions.     |
   | zmedico |                                                              |

   | 15180   | Fix blocker example output to appear as emerge actually      |
   | zmedico | displays it.                                                 |

svn path=/main/branches/prefix/; revision=15181
---

diff --git a/man/emerge.1 b/man/emerge.1
index b1d5e6752..7532797ac 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -590,7 +590,7 @@ When utilizing \fBemerge\fR with the \fB\-\-pretend\fR and \fB\-\-verbose\fR
 flags, the output may be a little hard to understand at first.  This section
 explains the abbreviations.
 .TP
-.B [blocks B     ] app\-text/dos2unix (from pkg app\-text/hd2u\-0.8.0)
+.B [blocks B     ] app\-text/dos2unix ("app\-text/dos2unix" is blocking app\-text/hd2u\-0.8.0)
 Dos2unix is Blocking hd2u from being emerged.  Blockers are defined when
 two packages will clobber each others files, or otherwise cause some form
 of breakage in your system.  However, blockers usually do not need to be
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 0b597f6c2..bc02874f2 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -1170,7 +1170,8 @@ def emerge_main():
 	if rval != os.EX_OK:
 		return rval
 
-	if portage._global_updates(trees, mtimedb["updates"]):
+	if myaction not in ('help', 'info', 'version') and \
+		portage._global_updates(trees, mtimedb["updates"]):
 		mtimedb.commit()
 		# Reload the whole config from scratch.
 		settings, trees, mtimedb = load_emerge_config(trees=trees)