| 1 |
Author: fuzzyray |
| 2 |
Date: 2008-09-03 20:31:31 +0000 (Wed, 03 Sep 2008) |
| 3 |
New Revision: 514 |
| 4 |
|
| 5 |
Modified: |
| 6 |
branches/gentoolkit-0.2.4/ChangeLog |
| 7 |
branches/gentoolkit-0.2.4/src/equery/equery |
| 8 |
branches/gentoolkit-0.2.4/src/gentoolkit/helpers.py |
| 9 |
Log: |
| 10 |
Merge changes from trunk to fix issues in 0.2.4 |
| 11 |
|
| 12 |
Modified: branches/gentoolkit-0.2.4/ChangeLog |
| 13 |
=================================================================== |
| 14 |
--- branches/gentoolkit-0.2.4/ChangeLog 2008-09-03 20:17:45 UTC (rev 513) |
| 15 |
+++ branches/gentoolkit-0.2.4/ChangeLog 2008-09-03 20:31:31 UTC (rev 514) |
| 16 |
@@ -1,3 +1,7 @@ |
| 17 |
+2008-09-03: Paul Varner <fuzzyray@g.o> |
| 18 |
+ * equery: Fix depgraph function to print out dependencies that don't |
| 19 |
+ resolve to a package (Bug #236492) |
| 20 |
+ |
| 21 |
2008-08-26: Paul Varner <fuzzyray@g.o> |
| 22 |
* glsa-check: Fix has_key() deprecation message. (Bug #232797) |
| 23 |
* revdep-rebuild: Update fix for Bug 232270 to utilize better patch |
| 24 |
|
| 25 |
Modified: branches/gentoolkit-0.2.4/src/equery/equery |
| 26 |
=================================================================== |
| 27 |
--- branches/gentoolkit-0.2.4/src/equery/equery 2008-09-03 20:17:45 UTC (rev 513) |
| 28 |
+++ branches/gentoolkit-0.2.4/src/equery/equery 2008-09-03 20:31:31 UTC (rev 514) |
| 29 |
@@ -375,7 +375,6 @@ |
| 30 |
query[i] = query[i].rstrip('/') |
| 31 |
q = map(lambda x: ((len(x) and x[0] == "/") and "^" or "/") |
| 32 |
+ re.escape(x) + "$", query) |
| 33 |
- print q |
| 34 |
try: |
| 35 |
q = "|".join(q) |
| 36 |
rx = re.compile(q) |
| 37 |
@@ -738,6 +737,7 @@ |
| 38 |
cpv = x[2] |
| 39 |
pkg = gentoolkit.find_best_match(x[0] + cpv) |
| 40 |
if not pkg: |
| 41 |
+ print pfx + x[0] + cpv + " (unable to resolve to a package / package masked or removed)" |
| 42 |
continue |
| 43 |
if pkg.get_cpv() in pkgtbl: |
| 44 |
continue |
| 45 |
|
| 46 |
Modified: branches/gentoolkit-0.2.4/src/gentoolkit/helpers.py |
| 47 |
=================================================================== |
| 48 |
--- branches/gentoolkit-0.2.4/src/gentoolkit/helpers.py 2008-09-03 20:17:45 UTC (rev 513) |
| 49 |
+++ branches/gentoolkit-0.2.4/src/gentoolkit/helpers.py 2008-09-03 20:31:31 UTC (rev 514) |
| 50 |
@@ -64,9 +64,9 @@ |
| 51 |
return [Package(x) for x in t] |
| 52 |
|
| 53 |
def find_best_match(search_key): |
| 54 |
- """Returns a Package object for the best available installed candidate that |
| 55 |
+ """Returns a Package object for the best available candidate that |
| 56 |
matched the search key.""" |
| 57 |
- t = portage.db["/"]["vartree"].dep_bestmatch(search_key) |
| 58 |
+ t = portage.db["/"]["porttree"].dep_bestmatch(search_key) |
| 59 |
if t: |
| 60 |
return Package(t) |
| 61 |
return None |
Archives