| 1 |
Author: zmedico |
| 2 |
Date: 2008-11-01 22:59:01 +0000 (Sat, 01 Nov 2008) |
| 3 |
New Revision: 11789 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
In _validate_deps(), show the ebuild version to clarify which ebuild the |
| 9 |
errors belong to. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2008-11-01 22:06:15 UTC (rev 11788) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2008-11-01 22:59:01 UTC (rev 11789) |
| 16 |
@@ -5863,27 +5863,31 @@ |
| 17 |
dep_check_trees[myroot]["porttree"] = \ |
| 18 |
FakeTree(fakedbapi(settings=mysettings)) |
| 19 |
|
| 20 |
+ msgs = [] |
| 21 |
for dep_type in dep_keys: |
| 22 |
mycheck = dep_check(metadata[dep_type], None, mysettings, |
| 23 |
myuse="all", myroot=myroot, trees=dep_check_trees) |
| 24 |
if not mycheck[0]: |
| 25 |
- writemsg("%s: %s\n%s\n" % ( |
| 26 |
- dep_type, metadata[dep_type], mycheck[1]), noiselevel=-1) |
| 27 |
- if mydo not in invalid_dep_exempt_phases: |
| 28 |
- return 1 |
| 29 |
+ msgs.append(" %s: %s\n %s\n" % ( |
| 30 |
+ dep_type, metadata[dep_type], mycheck[1])) |
| 31 |
|
| 32 |
for k in misc_keys: |
| 33 |
try: |
| 34 |
portage.dep.use_reduce( |
| 35 |
portage.dep.paren_reduce(metadata[k]), matchall=True) |
| 36 |
except portage.exception.InvalidDependString, e: |
| 37 |
- writemsg("%s: %s\n%s\n" % ( |
| 38 |
- k, metadata[k], str(e)), noiselevel=-1) |
| 39 |
- if mydo not in invalid_dep_exempt_phases: |
| 40 |
- return 1 |
| 41 |
+ msgs.append(" %s: %s\n %s\n" % ( |
| 42 |
+ k, metadata[k], str(e))) |
| 43 |
|
| 44 |
if not metadata["SLOT"]: |
| 45 |
- writemsg("SLOT is undefined\n", noiselevel=-1) |
| 46 |
+ msgs.append(" SLOT is undefined\n") |
| 47 |
+ |
| 48 |
+ if msgs: |
| 49 |
+ portage.util.writemsg_level("Error(s) in metadata for '%s':\n" % \ |
| 50 |
+ (mysettings.mycpv,), level=logging.ERROR, noiselevel=-1) |
| 51 |
+ for x in msgs: |
| 52 |
+ portage.util.writemsg_level(x, |
| 53 |
+ level=logging.ERROR, noiselevel=-1) |
| 54 |
if mydo not in invalid_dep_exempt_phases: |
| 55 |
return 1 |
Archives