| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 07:01:26 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13475 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Reorganize emerge --info <atom> display, and make sure that the "cpv was |
| 9 |
built with the following" line is shown for every package. (trunk r13304) |
| 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:14 UTC (rev 13474) |
| 14 |
+++ main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:01:26 UTC (rev 13475) |
| 15 |
@@ -13459,16 +13459,8 @@ |
| 16 |
if valuesmap[myvar] != global_vals[myvar]: |
| 17 |
diff_values[myvar] = valuesmap[myvar] |
| 18 |
|
| 19 |
- # If a difference was found, print the info for |
| 20 |
- # this package. |
| 21 |
- if diff_values: |
| 22 |
- # Print package info |
| 23 |
- print "%s was built with the following:" % pkg.cpv |
| 24 |
- for myvar in mydesiredvars: |
| 25 |
- if myvar in diff_values: |
| 26 |
- mylist = list(diff_values[myvar]) |
| 27 |
- mylist.sort() |
| 28 |
- print "%s=\"%s\"" % (myvar, " ".join(mylist)) |
| 29 |
+ print "\n%s was built with the following:" % \ |
| 30 |
+ colorize("INFORM", str(pkg.cpv)) |
| 31 |
|
| 32 |
pkgsettings.setcpv(pkg) |
| 33 |
forced_flags = set(chain(pkgsettings.useforce, |
| 34 |
@@ -13521,6 +13513,17 @@ |
| 35 |
print '%s="%s"' % (varname, ' '.join(str(f) for f in flags)), |
| 36 |
print |
| 37 |
|
| 38 |
+ # If a difference was found, print the info for |
| 39 |
+ # this package. |
| 40 |
+ if diff_values: |
| 41 |
+ # Print package info |
| 42 |
+ for myvar in mydesiredvars: |
| 43 |
+ if myvar in diff_values: |
| 44 |
+ mylist = list(diff_values[myvar]) |
| 45 |
+ mylist.sort() |
| 46 |
+ print "%s=\"%s\"" % (myvar, " ".join(mylist)) |
| 47 |
+ print |
| 48 |
+ |
| 49 |
print ">>> Attempting to run pkg_info() for '%s'" % pkg.cpv |
| 50 |
ebuildpath = vardb.findname(pkg.cpv) |
| 51 |
if not ebuildpath or not os.path.exists(ebuildpath): |
Archives