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 b1d5e6752abe5dae28ff4570a37ba8c262bc1d7e..7532797ac01f87936bc04b7890b272b981f65a95 100644 (file)
--- 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 0b597f6c25bb5fe09f2ba89682459bb5dc324d06..bc02874f2ebd7a7d61271c2b7ca256d7334518be 100644 (file)
--- 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)