diff options
| author | fuzzyray <fuzzyray@gentoo.org> | 2005-10-18 19:10:58 +0000 |
|---|---|---|
| committer | fuzzyray <fuzzyray@gentoo.org> | 2005-10-18 19:10:58 +0000 |
| commit | f22ce8942302272476bdfc0d35b958438bf66573 (patch) | |
| tree | 8d40d766bc450631022a09aa145fb1e32b0d31ed /trunk | |
| parent | 57542bb13cea7e957d947fa613bb5b82a1c31451 (diff) | |
| download | gentoolkit-f22ce8942302272476bdfc0d35b958438bf66573.tar.gz | |
Fix gentoolkit to properly parse '||' syntax. (Bug 101377)
svn path=/; revision=249
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/ChangeLog | 8 | ||||
| -rwxr-xr-x | trunk/src/equery/equery | 7 | ||||
| -rw-r--r-- | trunk/src/gentoolkit/package.py | 5 |
3 files changed, 17 insertions, 3 deletions
diff --git a/trunk/ChangeLog b/trunk/ChangeLog index a82c1f4..9aad3ae 100644 --- a/trunk/ChangeLog +++ b/trunk/ChangeLog @@ -1,3 +1,11 @@ +2005-10-18 Paul Varner <fuzzyray@gentoo.org> + * equery: Make equery look at both DEPEND and RDEPEND for dependencies + * gentoolkit: Fix _parse_deps to understand || syntax (Bug 101377) + +2005-10-14 Paul Varner <fuzzyray@gentoo.org> + * equery: Add qpkg --dups functionality to equery list command (bug + 109156) + 2005-10-13 Paul Varner <fuzzyray@gentoo.org> * equery: equery depgraph shows USE flags (Bug 74554) * equery: equery should properly parse use.local.desc (Bug 74569) diff --git a/trunk/src/equery/equery b/trunk/src/equery/equery index a59928f..1b2c3b0 100755 --- a/trunk/src/equery/equery +++ b/trunk/src/equery/equery @@ -668,7 +668,8 @@ class CmdDisplayDepGraph(Command): pkgtbl.append(cpv) - for x in pkg.get_runtime_deps(): + pkgdeps = pkg.get_runtime_deps() + pkg.get_compiletime_deps() + for x in pkgdeps: suffix = "" cpv = x[2] pkg = gentoolkit.find_best_match(x[0] + cpv) @@ -1038,7 +1039,7 @@ class CmdListDepends(Command): print_info(1, pp.section("* ") + "Dependencies for " + pp.cpv(pkg.get_cpv()) + ":") try: - deps = pkg.get_runtime_deps() + deps = pkg.get_runtime_deps() + pkg.get_compiletime_deps() except KeyError, e: # If the ebuild is not found... continue @@ -1054,7 +1055,7 @@ class CmdListDepends(Command): for pkg in packages: try: - deps = pkg.get_runtime_deps() + deps = pkg.get_runtime_deps() + pkg.get_compiletime_deps() except KeyError, e: # If the ebuild is not found... continue diff --git a/trunk/src/gentoolkit/package.py b/trunk/src/gentoolkit/package.py index 2bf27fc..69e0d8e 100644 --- a/trunk/src/gentoolkit/package.py +++ b/trunk/src/gentoolkit/package.py @@ -92,6 +92,11 @@ class Package: r += sr i += l + 3 continue + if tok == "||": + sr,l = self._parse_deps(deps[i+2:],curuse,level=level+1) + r += sr + i += l + 3 + continue # pick out comparator, if any cmp = "" for c in comparators: |