|
Seth Vidal |
b691e92 |
commit 11dfde5e065e21c5bdb25a087501b90afe0b0dab
|
|
Seth Vidal |
b691e92 |
Author: Seth Vidal <skvidal@fedoraproject.org>
|
|
Seth Vidal |
b691e92 |
Date: Tue Mar 23 10:09:20 2010 -0400
|
|
Seth Vidal |
b691e92 |
|
|
Seth Vidal |
b691e92 |
make sure we aren't overwriting the value of 'keys'
|
|
Seth Vidal |
b691e92 |
|
|
Seth Vidal |
b691e92 |
this determines how many args we pass back in our yielded results
|
|
Seth Vidal |
b691e92 |
never noticed it b/c nothing in yum uses keys=True - but it broke PK
|
|
Seth Vidal |
b691e92 |
|
|
Seth Vidal |
b691e92 |
diff --git a/yum/__init__.py b/yum/__init__.py
|
|
Seth Vidal |
b691e92 |
index ea73549..0aaa819 100644
|
|
Seth Vidal |
b691e92 |
--- a/yum/__init__.py
|
|
Seth Vidal |
b691e92 |
+++ b/yum/__init__.py
|
|
Seth Vidal |
b691e92 |
@@ -2163,10 +2163,10 @@ class YumBase(depsolve.Depsolve):
|
|
Seth Vidal |
b691e92 |
|
|
Seth Vidal |
b691e92 |
# do the ones we already have
|
|
Seth Vidal |
b691e92 |
for item in sorted_lists.values():
|
|
Seth Vidal |
b691e92 |
- for pkg, keys, values in item:
|
|
Seth Vidal |
b691e92 |
+ for pkg, k, v in item:
|
|
Seth Vidal |
b691e92 |
if pkg not in results_by_pkg:
|
|
Seth Vidal |
b691e92 |
results_by_pkg[pkg] = []
|
|
Seth Vidal |
b691e92 |
- results_by_pkg[pkg].append((keys,values))
|
|
Seth Vidal |
b691e92 |
+ results_by_pkg[pkg].append((k,v))
|
|
Seth Vidal |
b691e92 |
|
|
Seth Vidal |
b691e92 |
# take our existing dict-by-pkg and make the dict-by-count for
|
|
Seth Vidal |
b691e92 |
# this bizarro sorted_lists format
|
|
Seth Vidal |
b691e92 |
@@ -2175,9 +2175,9 @@ class YumBase(depsolve.Depsolve):
|
|
Seth Vidal |
b691e92 |
for pkg in results_by_pkg:
|
|
Seth Vidal |
b691e92 |
totkeys = []
|
|
Seth Vidal |
b691e92 |
totvals = []
|
|
Seth Vidal |
b691e92 |
- for (keys, values) in results_by_pkg[pkg]:
|
|
Seth Vidal |
b691e92 |
- totkeys.extend(keys)
|
|
Seth Vidal |
b691e92 |
- totvals.extend(values)
|
|
Seth Vidal |
b691e92 |
+ for (k, v) in results_by_pkg[pkg]:
|
|
Seth Vidal |
b691e92 |
+ totkeys.extend(k)
|
|
Seth Vidal |
b691e92 |
+ totvals.extend(v)
|
|
Seth Vidal |
b691e92 |
|
|
Seth Vidal |
b691e92 |
totkeys = misc.unique(totkeys)
|
|
Seth Vidal |
b691e92 |
totvals = misc.unique(totvals)
|