summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-30 07:29:39 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-30 07:29:39 +0000
commit37ca6c30eeae70e65dface8faa88db23e33a3419 (patch)
tree35cf3977794783462d6d1f054146526e9c4100a5
parentBug #267104 - If the statvfs f_bavail field shows insufficient free space and (diff)
downloadportage-multirepo-37ca6c30eeae70e65dface8faa88db23e33a3419.tar.gz
portage-multirepo-37ca6c30eeae70e65dface8faa88db23e33a3419.tar.bz2
portage-multirepo-37ca6c30eeae70e65dface8faa88db23e33a3419.zip
Bug #267810 - Don't sort C/CXX/LDFLAGS in emerge --info output since these
variables aren't really sortable in that way. (trunk r13407) svn path=/main/branches/2.1.6/; revision=13547
-rw-r--r--pym/_emerge/__init__.py26
1 files changed, 3 insertions, 23 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 7023c338..f2e84656 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -13666,9 +13666,6 @@ def action_info(settings, trees, myopts, myfiles):
global_vals = {}
pkgsettings = portage.config(clone=settings)
- for myvar in mydesiredvars:
- global_vals[myvar] = set(settings.get(myvar, "").split())
-
# Loop through each package
# Only print settings if they differ from global settings
header_title = "Package Settings"
@@ -13684,17 +13681,6 @@ def action_info(settings, trees, myopts, myfiles):
installed=True, metadata=izip(Package.metadata_keys,
(metadata.get(x, '') for x in Package.metadata_keys)),
root_config=root_config, type_name='installed')
- valuesmap = {}
- for k in auxkeys:
- valuesmap[k] = set(metadata[k].split())
-
- diff_values = {}
- for myvar in mydesiredvars:
- # If the package variable doesn't match the
- # current global variable, something has changed
- # so set diff_found so we know to print
- if valuesmap[myvar] != global_vals[myvar]:
- diff_values[myvar] = valuesmap[myvar]
print "\n%s was built with the following:" % \
colorize("INFORM", str(pkg.cpv))
@@ -13750,15 +13736,9 @@ def action_info(settings, trees, myopts, myfiles):
print '%s="%s"' % (varname, ' '.join(str(f) for f in flags)),
print
- # If a difference was found, print the info for
- # this package.
- if diff_values:
- # Print package info
- for myvar in mydesiredvars:
- if myvar in diff_values:
- mylist = list(diff_values[myvar])
- mylist.sort()
- print "%s=\"%s\"" % (myvar, " ".join(mylist))
+ for myvar in mydesiredvars:
+ if metadata[myvar].split() != settings.get(myvar, '').split():
+ print "%s=\"%s\"" % (myvar, metadata[myvar])
print
if metadata['DEFINED_PHASES']: