| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-05 03:31:40 +0000 (Mon, 05 May 2008) |
| 3 |
New Revision: 10191 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Use writemsg() to warn about InvalidDependString exceptions that may |
| 9 |
occur for installed packages. (trunk r10190) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-05-05 03:30:24 UTC (rev 10190) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-05 03:31:40 UTC (rev 10191) |
| 16 |
@@ -3907,7 +3907,11 @@ |
| 17 |
"system"].iterAtomsForPackage(task): |
| 18 |
skip = True |
| 19 |
break |
| 20 |
- except portage_exception.InvalidDependString: |
| 21 |
+ except portage_exception.InvalidDependString, e: |
| 22 |
+ portage.writemsg("!!! Invalid PROVIDE in " + \ |
| 23 |
+ "'%svar/db/pkg/%s/PROVIDE': %s\n" % \ |
| 24 |
+ (task.root, task.cpv, e), noiselevel=-1) |
| 25 |
+ del e |
| 26 |
skip = True |
| 27 |
if skip: |
| 28 |
continue |
| 29 |
@@ -3936,7 +3940,11 @@ |
| 30 |
if not satisfied: |
| 31 |
skip = True |
| 32 |
break |
| 33 |
- except portage_exception.InvalidDependString: |
| 34 |
+ except portage_exception.InvalidDependString, e: |
| 35 |
+ portage.writemsg("!!! Invalid PROVIDE in " + \ |
| 36 |
+ "'%svar/db/pkg/%s/PROVIDE': %s\n" % \ |
| 37 |
+ (task.root, task.cpv, e), noiselevel=-1) |
| 38 |
+ del e |
| 39 |
skip = True |
| 40 |
if skip: |
| 41 |
continue |
| 42 |
|
| 43 |
-- |
| 44 |
gentoo-commits@l.g.o mailing list |
Archives