| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 07:01:38 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13476 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Don't try to execut the pkg_info phase if DEFINED_PHASES is available and |
| 9 |
it shows that the phase is undefined. (trunk r13305) |
| 10 |
|
| 11 |
Modified: main/branches/2.1.6/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:01:26 UTC (rev 13475) |
| 14 |
+++ main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:01:38 UTC (rev 13476) |
| 15 |
@@ -13426,6 +13426,7 @@ |
| 16 |
# the current config) |
| 17 |
mydesiredvars = [ 'CHOST', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS' ] |
| 18 |
auxkeys = mydesiredvars + list(vardb._aux_cache_keys) |
| 19 |
+ auxkeys.append('DEFINED_PHASES') |
| 20 |
global_vals = {} |
| 21 |
pkgsettings = portage.config(clone=settings) |
| 22 |
|
| 23 |
@@ -13524,6 +13525,10 @@ |
| 24 |
print "%s=\"%s\"" % (myvar, " ".join(mylist)) |
| 25 |
print |
| 26 |
|
| 27 |
+ if metadata['DEFINED_PHASES']: |
| 28 |
+ if 'info' not in metadata['DEFINED_PHASES'].split(): |
| 29 |
+ continue |
| 30 |
+ |
| 31 |
print ">>> Attempting to run pkg_info() for '%s'" % pkg.cpv |
| 32 |
ebuildpath = vardb.findname(pkg.cpv) |
| 33 |
if not ebuildpath or not os.path.exists(ebuildpath): |
Archives