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