| 1 |
Author: zmedico |
| 2 |
Date: 2008-11-21 21:57:02 +0000 (Fri, 21 Nov 2008) |
| 3 |
New Revision: 12019 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Bug #248059 - In action_depclean(), ignore invalid atoms in deps of packages |
| 9 |
to be uninstalled. (trunk r12018) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.6/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.6/pym/_emerge/__init__.py 2008-11-21 21:55:43 UTC (rev 12018) |
| 15 |
+++ main/branches/2.1.6/pym/_emerge/__init__.py 2008-11-21 21:57:02 UTC (rev 12019) |
| 16 |
@@ -12435,8 +12435,11 @@ |
| 17 |
|
| 18 |
priority = priority_map[dep_type] |
| 19 |
for atom in atoms: |
| 20 |
- if atom.startswith("!"): |
| 21 |
+ if not isinstance(atom, portage.dep.Atom): |
| 22 |
+ # Ignore invalid atoms returned from dep_check(). |
| 23 |
continue |
| 24 |
+ if atom.blocker: |
| 25 |
+ continue |
| 26 |
matches = vardb.match_pkgs(atom) |
| 27 |
if not matches: |
| 28 |
continue |
Archives