diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-09-14 20:34:10 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-14 18:05:54 -0700 |
| commit | b666024c82ab73ab5c2cbdfb2c8b12ec008b2b81 (patch) | |
| tree | ececba1ac0b5222abeb34a3a2bb388c9380c86cf /pym/portage/util/__init__.py | |
| parent | 0f2e8db77193a4eba48bfce0848bc857fc9f5c2d (diff) | |
| download | portage-b666024c82ab73ab5c2cbdfb2c8b12ec008b2b81.tar.gz portage-b666024c82ab73ab5c2cbdfb2c8b12ec008b2b81.tar.bz2 portage-b666024c82ab73ab5c2cbdfb2c8b12ec008b2b81.zip | |
Add :.repo syntax support for portage.util.{grabfile_package,grabdict_package}
Diffstat (limited to 'pym/portage/util/__init__.py')
| -rw-r--r-- | pym/portage/util/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index 600068507..8bbc15b92 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -331,7 +331,7 @@ def read_corresponding_eapi_file(filename): return eapi -def grabdict_package(myfilename, juststrings=0, recursive=0, allow_wildcard=False, verify_eapi=False): +def grabdict_package(myfilename, juststrings=0, recursive=0, allow_wildcard=False, allow_repo=False, verify_eapi=False): """ Does the same thing as grabdict except it validates keys with isvalidatom()""" pkgs=grabdict(myfilename, juststrings, empty=1, recursive=recursive) @@ -345,7 +345,7 @@ def grabdict_package(myfilename, juststrings=0, recursive=0, allow_wildcard=Fals atoms = {} for k, v in pkgs.items(): try: - k = Atom(k, allow_wildcard=allow_wildcard, eapi=eapi) + k = Atom(k, allow_wildcard=allow_wildcard, allow_repo=allow_repo, eapi=eapi) except InvalidAtom as e: writemsg(_("--- Invalid atom in %s: %s\n") % (myfilename, e), noiselevel=-1) @@ -353,7 +353,7 @@ 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, \ +def grabfile_package(myfilename, compatlevel=0, recursive=0, allow_wildcard=False, allow_repo=False, \ remember_source_file=False, verify_eapi=False): pkgs=grabfile(myfilename, compatlevel, recursive=recursive, remember_source_file=True) @@ -370,7 +370,7 @@ def grabfile_package(myfilename, compatlevel=0, recursive=0, allow_wildcard=Fals if pkg[:1] == '*' and mybasename == 'packages': pkg = pkg[1:] try: - pkg = Atom(pkg, allow_wildcard=allow_wildcard, eapi=eapi) + pkg = Atom(pkg, allow_wildcard=allow_wildcard, allow_repo=allow_repo, eapi=eapi) except InvalidAtom as e: writemsg(_("--- Invalid atom in %s: %s\n") % (myfilename, e), noiselevel=-1) |