On Sat, 1 Aug 2015 14:31:57 -0700
Zac Medico <zmed...@gentoo.org> wrote:
> This code has been broken since commit
> 34055adae6bd90fc64f18421e2cec5f8da6f7c33.
>
> Fixes: 34055adae6bd ("binpkg-multi-instance 1 of 7")
> X-Gentoo-Bug: 556464
> X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=556464
> ---
> pym/_emerge/depgraph.py | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
> index 1683280..a1c50f2 100644
> --- a/pym/_emerge/depgraph.py
> +++ b/pym/_emerge/depgraph.py
> @@ -31,6 +31,7 @@ from portage.eapi import eapi_has_strong_blocks,
> eapi_has_required_use, \ _get_eapi_attrs
> from portage.exception import (InvalidAtom, InvalidData,
> InvalidDependString, PackageNotFound, PortageException)
> +from portage.localization import _
> from portage.output import colorize, create_color_func, \
> darkgreen, green
> bad = create_color_func("BAD")
> @@ -3632,14 +3633,18 @@ class depgraph(object):
> writemsg(colorize("BAD",
> "\n*** Package is missing CATEGORY metadata: %s.\n\n" % x),
> noiselevel=-1) self._dynamic_config._skip_restart = True return 0,
> myfavorites
> - elif os.path.realpath(x) != \
> -
> os.path.realpath(bindb.bintree.getname(mykey)):
> - writemsg(colorize("BAD",
> "\n*** You need to adjust PKGDIR to emerge this package.\n\n"),
> noiselevel=-1) +
> + x = os.path.realpath(x)
> + for pkg in
> self._iter_match_pkgs(root_config, "binary", Atom('=%s' % mykey)):
> + if x ==
> os.path.realpath(bindb.bintree.getname(pkg.cpv)):
> + break
> + else:
> + writemsg("\n%s\n\n" %
> colorize("BAD",
> + _("*** You need to
> adjust PKGDIR to emerge "
> + "this package: %s")
> % x), noiselevel=-1) self._dynamic_config._skip_restart = True
> return 0, myfavorites
>
> - pkg = self._pkg(mykey, "binary",
> root_config,
> - onlydeps=onlydeps)
> args.append(PackageArg(arg=x,
> package=pkg, root_config=root_config))
> elif ext==".ebuild":
looks fine :)
--
Brian Dolbec <dolsen>
