diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2010-11-06 22:40:09 +0100 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-11-23 17:59:19 -0800 |
| commit | 167704c9f9324106013fea94a776ee9de6632c77 (patch) | |
| tree | f68ee236a5390b6fa4893a7dd93fffa5fd3310be | |
| parent | 603edb3b652d856afef223753947fdb78d0bb760 (diff) | |
| download | portage-167704c9f9324106013fea94a776ee9de6632c77.tar.gz portage-167704c9f9324106013fea94a776ee9de6632c77.tar.bz2 portage-167704c9f9324106013fea94a776ee9de6632c77.zip | |
Accept eapi argument in portage.util.grabdict_package() and
portage.util.grabfile_package().
| -rw-r--r-- | pym/portage/util/__init__.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index 6c39f8952..5d4dfa750 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -349,12 +349,12 @@ def read_corresponding_eapi_file(filename): return eapi -def grabdict_package(myfilename, juststrings=0, recursive=0, allow_wildcard=False, allow_repo=False, verify_eapi=False): +def grabdict_package(myfilename, juststrings=0, recursive=0, allow_wildcard=False, allow_repo=False, + verify_eapi=False, eapi=None): """ Does the same thing as grabdict except it validates keys with isvalidatom()""" pkgs=grabdict(myfilename, juststrings, empty=1, recursive=recursive) - eapi = None - if verify_eapi: + if verify_eapi and eapi is None: eapi = read_corresponding_eapi_file(myfilename) # We need to call keys() here in order to avoid the possibility of @@ -371,12 +371,11 @@ def grabdict_package(myfilename, juststrings=0, recursive=0, allow_wildcard=Fals atoms[k] = v return atoms -def grabfile_package(myfilename, compatlevel=0, recursive=0, allow_wildcard=False, allow_repo=False, \ - remember_source_file=False, verify_eapi=False): +def grabfile_package(myfilename, compatlevel=0, recursive=0, allow_wildcard=False, allow_repo=False, + remember_source_file=False, verify_eapi=False, eapi=None): pkgs=grabfile(myfilename, compatlevel, recursive=recursive, remember_source_file=True) - eapi = None - if verify_eapi: + if verify_eapi and eapi is None: eapi = read_corresponding_eapi_file(myfilename) mybasename = os.path.basename(myfilename) atoms = [] |