diff options
| author | fuzzyray <fuzzyray@gentoo.org> | 2009-05-05 21:04:27 +0000 |
|---|---|---|
| committer | fuzzyray <fuzzyray@gentoo.org> | 2009-05-05 21:04:27 +0000 |
| commit | 7dd5d6b8f250db3657040e3bcb9e44b674d74bb4 (patch) | |
| tree | a222f01c8594973b60e9de5508d4d2600309547f /pym | |
| parent | d03c4875f20b77a54021232bc3c7be612706b4a4 (diff) | |
| download | gentoolkit-7dd5d6b8f250db3657040e3bcb9e44b674d74bb4.tar.gz | |
Update to most recent versions and add changes from djanderson
svn path=/trunk/gentoolkit/; revision=599
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/gentoolkit/helpers2.py | 8 | ||||
| -rw-r--r-- | pym/gentoolkit/package.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pym/gentoolkit/helpers2.py b/pym/gentoolkit/helpers2.py index 20d1de0..1a2530a 100644 --- a/pym/gentoolkit/helpers2.py +++ b/pym/gentoolkit/helpers2.py @@ -132,6 +132,8 @@ def uses_globbing(query): def _do_complex_lookup(query, query_opts): """Find matches for a query which is a regex or includes globbing.""" + # pylint: Too many branches (18/12) + # pylint: disable-message=R0912 result = [] if query_opts["includeInstalled"]: @@ -240,8 +242,6 @@ def _do_simple_lookup(query, query_opts): def do_lookup(query, query_opts): """A high-level wrapper around gentoolkit package-finder functions. - @todo: equery modules to move to do_lookup: c,m,u,w - @type query: str @param query: pkg, cat/pkg, pkg-ver, cat/pkg-ver, atom or regex @type query_opts: dict @@ -401,9 +401,9 @@ def prepare_categories(category_filter): def split_query(query): - """Split a query, using either. + """Split a query into category, name, version and revision. - @see: split_atom, gentoolkit.split_package_name + @type query: str @param query: pkg, cat/pkg, pkg-ver, cat/pkg-ver, atom or regex @rtype: tuple @return: (category, pkg_name, version, revision) diff --git a/pym/gentoolkit/package.py b/pym/gentoolkit/package.py index 65cdb9a..340a512 100644 --- a/pym/gentoolkit/package.py +++ b/pym/gentoolkit/package.py @@ -465,7 +465,7 @@ class Package(object): """ if not self._db: self._db = portage.dblink( - category, + self.category, "%s-%s" % (self.name, self.fullversion), settings["ROOT"], settings |