diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-26 14:29:34 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-26 14:29:34 -0700 |
| commit | bf9b3e70758454afa53972340abc98a248195e45 (patch) | |
| tree | be006323ea37fcad7be18d99821d883cfe9bc6ec /bin | |
| parent | 1112bbcd7f74e8fc507d0057fb153c9bbed8fc50 (diff) | |
| download | portage-bf9b3e70758454afa53972340abc98a248195e45.tar.gz portage-bf9b3e70758454afa53972340abc98a248195e45.tar.bz2 portage-bf9b3e70758454afa53972340abc98a248195e45.zip | |
Make the Atom class add 'EAPI.incompatible' category attributes to
InvalidAtom exceptions, make use_reduce() raise InvalidDependString
exceptions that encapsulate InvalidAtom exceptions, and make
Package._validate_deps() use the InvalidAtom categories when
recording the invalid metadata for use by repoman. Also, remove
the EAPI.incompatible code from repoman that's no longer used.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/repoman | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/bin/repoman b/bin/repoman index 1ad5b28b2..708ef7079 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1652,33 +1652,6 @@ for x in scanlist: stats[mytype + '.suspect'] += 1 fails[mytype + '.suspect'].append( relative_path + ": '%s'" % atom) - if not eapi_has_slot_deps(eapi): - if portage.dep.dep_getslot(atom): - stats['EAPI.incompatible'] += 1 - fails['EAPI.incompatible'].append( - (relative_path + ": %s slot dependency" + \ - " not supported with EAPI='%s':" + \ - " '%s'") % (mytype, eapi, atom)) - if atom.use and not eapi_has_use_deps(eapi): - stats['EAPI.incompatible'] += 1 - fails['EAPI.incompatible'].append( - (relative_path + ": %s use dependency" + \ - " not supported with EAPI='%s':" + \ - " '%s'") % (mytype, eapi, atom)) - if atom.use and (atom.use.missing_enabled or atom.use.missing_disabled) and \ - not eapi_has_use_dep_defaults(eapi): - stats['EAPI.incompatible'] += 1 - fails['EAPI.incompatible'].append( - (relative_path + ": %s use dependency" + \ - " not supported with EAPI='%s':" + \ - " '%s'") % (mytype, eapi, atom)) - if atom.blocker and atom.blocker.overlap.forbid \ - and not eapi_has_strong_blocks(eapi): - stats['EAPI.incompatible'] += 1 - fails['EAPI.incompatible'].append( - (relative_path + ": %s new blocker syntax" + \ - " not supported with EAPI='%s':" + \ - " '%s'") % (mytype, eapi, atom)) if atom.operator == "~" and \ portage.versions.catpkgsplit(atom.cpv)[3] != "r0": |