diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-10 22:45:31 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-10 22:30:34 -0700 |
| commit | a86cd8e23dfda87ff87625464ed23cd75566237f (patch) | |
| tree | d3c5bf17e3397506aa2346990b2f583719c550a7 /pym/portage/package/ebuild/doebuild.py | |
| parent | 44dac97ec6dcfff3d804f712eb3fcdefc8f01dbc (diff) | |
| download | portage-a86cd8e23dfda87ff87625464ed23cd75566237f.tar.gz portage-a86cd8e23dfda87ff87625464ed23cd75566237f.tar.bz2 portage-a86cd8e23dfda87ff87625464ed23cd75566237f.zip | |
portage.dep.use_reduce: pass is_src_uri when needed
Remove the now unneded _src_uri_validate.
Diffstat (limited to 'pym/portage/package/ebuild/doebuild.py')
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 6ceafb0e1..f066df757 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -1050,7 +1050,7 @@ def _validate_deps(mysettings, myroot, mydo, mydbapi): set(["clean", "cleanrm", "help", "prerm", "postrm"]) dep_keys = ["DEPEND", "RDEPEND", "PDEPEND"] misc_keys = ["LICENSE", "PROPERTIES", "PROVIDE", "RESTRICT", "SRC_URI"] - other_keys = ["SLOT"] + other_keys = ["SLOT", "EAPI"] all_keys = dep_keys + misc_keys + other_keys metadata = dict(zip(all_keys, mydbapi.aux_get(mysettings.mycpv, all_keys))) @@ -1070,9 +1070,11 @@ def _validate_deps(mysettings, myroot, mydo, mydbapi): msgs.append(" %s: %s\n %s\n" % ( dep_type, metadata[dep_type], mycheck[1])) + eapi = metadata["EAPI"] for k in misc_keys: try: - use_reduce(metadata[k], matchall=True) + use_reduce(metadata[k], matchall=True, is_src_uri=(k=="SRC_URI"), \ + allow_src_uri_file_renames=(eapi not in ("0", "1"))) except InvalidDependString as e: msgs.append(" %s: %s\n %s\n" % ( k, metadata[k], str(e))) |