| 1 |
Author: zmedico |
| 2 |
Date: 2008-06-29 06:46:13 +0000 (Sun, 29 Jun 2008) |
| 3 |
New Revision: 10844 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Handle invalid atoms inside depgraph._add_pkg_deps(), to avoid an |
| 9 |
unhandled InvalidAtom exception from dep_expand() when matching |
| 10 |
against the vardb. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/_emerge/__init__.py 2008-06-29 04:27:57 UTC (rev 10843) |
| 16 |
+++ main/trunk/pym/_emerge/__init__.py 2008-06-29 06:46:13 UTC (rev 10844) |
| 17 |
@@ -2749,6 +2749,13 @@ |
| 18 |
if debug: |
| 19 |
print "Candidates:", selected_atoms |
| 20 |
for atom in selected_atoms: |
| 21 |
+ if isinstance(atom, basestring) \ |
| 22 |
+ and not portage.isvalidatom(atom): |
| 23 |
+ show_invalid_depstring_notice( |
| 24 |
+ pkg, dep_string, str(atom)) |
| 25 |
+ if not pkg.installed: |
| 26 |
+ return 0 |
| 27 |
+ continue |
| 28 |
blocker = atom.startswith("!") |
| 29 |
if blocker: |
| 30 |
atom = atom[1:] |
| 31 |
|
| 32 |
-- |
| 33 |
gentoo-commits@l.g.o mailing list |
Archives