diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-07-23 09:41:20 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-07-23 09:47:12 -0700 |
| commit | cbd919b99aa250971107f5b225ba2c55aa4f0572 (patch) | |
| tree | cf38000eb8f179c0ac2fa4ca49ebdce39c67613d /pym/portage/util/__init__.py | |
| parent | 4f18b95298423b28691f43911632d5d34f69fc84 (diff) | |
| download | portage-cbd919b99aa250971107f5b225ba2c55aa4f0572.tar.gz portage-cbd919b99aa250971107f5b225ba2c55aa4f0572.tar.bz2 portage-cbd919b99aa250971107f5b225ba2c55aa4f0572.zip | |
portage.util.grab*(): Add optional parameter to allow wildscards in atoms
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 30f1821e4..8b110f8a8 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -282,7 +282,7 @@ def grabdict(myfilename, juststrings=0, empty=0, recursive=0, incremental=1): newdict[k] = " ".join(v) return newdict -def grabdict_package(myfilename, juststrings=0, recursive=0): +def grabdict_package(myfilename, juststrings=0, recursive=0, allow_wildcard=False): """ Does the same thing as grabdict except it validates keys with isvalidatom()""" pkgs=grabdict(myfilename, juststrings, empty=1, recursive=recursive) @@ -292,7 +292,7 @@ def grabdict_package(myfilename, juststrings=0, recursive=0): atoms = {} for k, v in pkgs.items(): try: - k = Atom(k, allow_wildcard=True) + k = Atom(k, allow_wildcard=allow_wildcard) except InvalidAtom: writemsg(_("--- Invalid atom in %s: %s\n") % (myfilename, k), noiselevel=-1) @@ -300,7 +300,7 @@ def grabdict_package(myfilename, juststrings=0, recursive=0): atoms[k] = v return atoms -def grabfile_package(myfilename, compatlevel=0, recursive=0): +def grabfile_package(myfilename, compatlevel=0, recursive=0, allow_wildcard=False): pkgs=grabfile(myfilename, compatlevel, recursive=recursive) mybasename = os.path.basename(myfilename) atoms = [] @@ -312,7 +312,7 @@ def grabfile_package(myfilename, compatlevel=0, recursive=0): if pkg[:1] == '*' and mybasename == 'packages': pkg = pkg[1:] try: - pkg = Atom(pkg) + pkg = Atom(pkg, allow_wildcard=allow_wildcard) except InvalidAtom: writemsg(_("--- Invalid atom in %s: %s\n") % (myfilename, pkg), noiselevel=-1) |