From: Zac Medico Date: Sat, 9 Oct 2010 01:14:53 +0000 (-0700) Subject: Use EAPI to validate best/has_version atoms. X-Git-Tag: v2.2_rc92~11 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=876c0823ddf551a66cdce270c5503d57c3afc8bc;p=portage.git Use EAPI to validate best/has_version atoms. --- diff --git a/bin/portageq b/bin/portageq index 4c9b9c13e..b450c7a18 100755 --- a/bin/portageq +++ b/bin/portageq @@ -80,7 +80,7 @@ def has_version(argv): print("ERROR: insufficient parameters!") sys.exit(2) try: - atom = portage.dep.Atom(argv[1]) + atom = portage.dep.Atom(argv[1], eapi=eapi) except portage.exception.InvalidAtom: if atom_validate_strict: portage.writemsg("ERROR: Invalid atom: '%s'\n" % argv[1], @@ -114,7 +114,7 @@ def best_version(argv): print("ERROR: insufficient parameters!") sys.exit(2) try: - atom = portage.dep.Atom(argv[1]) + atom = portage.dep.Atom(argv[1], eapi=eapi) except portage.exception.InvalidAtom: if atom_validate_strict: portage.writemsg("ERROR: Invalid atom: '%s'\n" % argv[1], @@ -617,6 +617,9 @@ def usage(argv): print("\nRun portageq with --help for info") atom_validate_strict = "EBUILD_PHASE" in os.environ +eapi = None +if atom_validate_strict: + eapi = os.environ.get('EAPI') def main(): if "-h" in sys.argv or "--help" in sys.argv: