| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 07:29:39 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13547 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Bug #267810 - Don't sort C/CXX/LDFLAGS in emerge --info output since these |
| 9 |
variables aren't really sortable in that way. (trunk r13407) |
| 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:29:25 UTC (rev 13546) |
| 14 |
+++ main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:29:39 UTC (rev 13547) |
| 15 |
@@ -13666,9 +13666,6 @@ |
| 16 |
global_vals = {} |
| 17 |
pkgsettings = portage.config(clone=settings) |
| 18 |
|
| 19 |
- for myvar in mydesiredvars: |
| 20 |
- global_vals[myvar] = set(settings.get(myvar, "").split()) |
| 21 |
- |
| 22 |
# Loop through each package |
| 23 |
# Only print settings if they differ from global settings |
| 24 |
header_title = "Package Settings" |
| 25 |
@@ -13684,18 +13681,7 @@ |
| 26 |
installed=True, metadata=izip(Package.metadata_keys, |
| 27 |
(metadata.get(x, '') for x in Package.metadata_keys)), |
| 28 |
root_config=root_config, type_name='installed') |
| 29 |
- valuesmap = {} |
| 30 |
- for k in auxkeys: |
| 31 |
- valuesmap[k] = set(metadata[k].split()) |
| 32 |
|
| 33 |
- diff_values = {} |
| 34 |
- for myvar in mydesiredvars: |
| 35 |
- # If the package variable doesn't match the |
| 36 |
- # current global variable, something has changed |
| 37 |
- # so set diff_found so we know to print |
| 38 |
- if valuesmap[myvar] != global_vals[myvar]: |
| 39 |
- diff_values[myvar] = valuesmap[myvar] |
| 40 |
- |
| 41 |
print "\n%s was built with the following:" % \ |
| 42 |
colorize("INFORM", str(pkg.cpv)) |
| 43 |
|
| 44 |
@@ -13750,15 +13736,9 @@ |
| 45 |
print '%s="%s"' % (varname, ' '.join(str(f) for f in flags)), |
| 46 |
print |
| 47 |
|
| 48 |
- # If a difference was found, print the info for |
| 49 |
- # this package. |
| 50 |
- if diff_values: |
| 51 |
- # Print package info |
| 52 |
- for myvar in mydesiredvars: |
| 53 |
- if myvar in diff_values: |
| 54 |
- mylist = list(diff_values[myvar]) |
| 55 |
- mylist.sort() |
| 56 |
- print "%s=\"%s\"" % (myvar, " ".join(mylist)) |
| 57 |
+ for myvar in mydesiredvars: |
| 58 |
+ if metadata[myvar].split() != settings.get(myvar, '').split(): |
| 59 |
+ print "%s=\"%s\"" % (myvar, metadata[myvar]) |
| 60 |
print |
| 61 |
|
| 62 |
if metadata['DEFINED_PHASES']: |
Archives