| 1 |
Author: zmedico |
| 2 |
Date: 2008-10-01 21:17:32 +0000 (Wed, 01 Oct 2008) |
| 3 |
New Revision: 11604 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Bug #239272 - Handle InvalidAtom exception inside |
| 9 |
depgraph.validate_blockers(). |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-10-01 17:43:37 UTC (rev 11603) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-10-01 21:17:32 UTC (rev 11604) |
| 16 |
@@ -5890,10 +5890,16 @@ |
| 17 |
blocker_cache[cpv] = \ |
| 18 |
blocker_cache.BlockerData(counter, blocker_atoms) |
| 19 |
if blocker_atoms: |
| 20 |
- for myatom in blocker_atoms: |
| 21 |
- blocker = Blocker(atom=portage.dep.Atom(myatom), |
| 22 |
- eapi=pkg.metadata["EAPI"], root=myroot) |
| 23 |
- self._blocker_parents.add(blocker, pkg) |
| 24 |
+ try: |
| 25 |
+ for atom in blocker_atoms: |
| 26 |
+ blocker = Blocker(atom=portage.dep.Atom(atom), |
| 27 |
+ eapi=pkg.metadata["EAPI"], root=myroot) |
| 28 |
+ self._blocker_parents.add(blocker, pkg) |
| 29 |
+ except portage.exception.InvalidAtom, e: |
| 30 |
+ depstr = " ".join(vardb.aux_get(pkg.cpv, dep_keys)) |
| 31 |
+ show_invalid_depstring_notice( |
| 32 |
+ pkg, depstr, "Invalid Atom: %s" % (e,)) |
| 33 |
+ return False |
| 34 |
for cpv in stale_cache: |
| 35 |
del blocker_cache[cpv] |
| 36 |
blocker_cache.flush() |
Archives