Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r15241 - main/branches/2.1.7/pym/_emerge
Date: Fri, 29 Jan 2010 18:46:38
Message-Id: E1NavrY-0006Jd-K2@stork.gentoo.org
1 Author: zmedico
2 Date: 2010-01-29 18:46:36 +0000 (Fri, 29 Jan 2010)
3 New Revision: 15241
4
5 Modified:
6 main/branches/2.1.7/pym/_emerge/main.py
7 Log:
8 Skip global updates for help, version, and info actions. (trunk r15179)
9
10 Modified: main/branches/2.1.7/pym/_emerge/main.py
11 ===================================================================
12 --- main/branches/2.1.7/pym/_emerge/main.py 2010-01-29 18:46:24 UTC (rev 15240)
13 +++ main/branches/2.1.7/pym/_emerge/main.py 2010-01-29 18:46:36 UTC (rev 15241)
14 @@ -1027,7 +1027,8 @@
15 if rval != os.EX_OK:
16 return rval
17
18 - if portage._global_updates(trees, mtimedb["updates"]):
19 + if myaction not in ('help', 'info', 'version') and \
20 + portage._global_updates(trees, mtimedb["updates"]):
21 mtimedb.commit()
22 # Reload the whole config from scratch.
23 settings, trees, mtimedb = load_emerge_config(trees=trees)