| 1 |
commit: cb4cd5025405b28f76b3487f5eec82590e2cabdb |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 23 18:51:43 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 23 18:51:43 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cb4cd502 |
| 7 |
|
| 8 |
Skip global updates prior to sync (called after). |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/main.py | 3 ++- |
| 12 |
1 files changed, 2 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py |
| 15 |
index 26f3766..b170ea3 100644 |
| 16 |
--- a/pym/_emerge/main.py |
| 17 |
+++ b/pym/_emerge/main.py |
| 18 |
@@ -1611,7 +1611,8 @@ def emerge_main(args=None): |
| 19 |
tmpcmdline.extend(args) |
| 20 |
myaction, myopts, myfiles = parse_opts(tmpcmdline) |
| 21 |
|
| 22 |
- if myaction not in ('help', 'info', 'version') and \ |
| 23 |
+ # skip global updates prior to sync, since it's called after sync |
| 24 |
+ if myaction not in ('help', 'info', 'sync', 'version') and \ |
| 25 |
myopts.get('--package-moves') != 'n' and \ |
| 26 |
_global_updates(trees, mtimedb["updates"], quiet=("--quiet" in myopts)): |
| 27 |
mtimedb.commit() |
Archives