1 |
On Sat, 1 Aug 2015 14:31:57 -0700 |
2 |
Zac Medico <zmedico@g.o> wrote: |
3 |
|
4 |
> This code has been broken since commit |
5 |
> 34055adae6bd90fc64f18421e2cec5f8da6f7c33. |
6 |
> |
7 |
> Fixes: 34055adae6bd ("binpkg-multi-instance 1 of 7") |
8 |
> X-Gentoo-Bug: 556464 |
9 |
> X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=556464 |
10 |
> --- |
11 |
> pym/_emerge/depgraph.py | 15 ++++++++++----- |
12 |
> 1 file changed, 10 insertions(+), 5 deletions(-) |
13 |
> |
14 |
> diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
15 |
> index 1683280..a1c50f2 100644 |
16 |
> --- a/pym/_emerge/depgraph.py |
17 |
> +++ b/pym/_emerge/depgraph.py |
18 |
> @@ -31,6 +31,7 @@ from portage.eapi import eapi_has_strong_blocks, |
19 |
> eapi_has_required_use, \ _get_eapi_attrs |
20 |
> from portage.exception import (InvalidAtom, InvalidData, |
21 |
> InvalidDependString, PackageNotFound, PortageException) |
22 |
> +from portage.localization import _ |
23 |
> from portage.output import colorize, create_color_func, \ |
24 |
> darkgreen, green |
25 |
> bad = create_color_func("BAD") |
26 |
> @@ -3632,14 +3633,18 @@ class depgraph(object): |
27 |
> writemsg(colorize("BAD", |
28 |
> "\n*** Package is missing CATEGORY metadata: %s.\n\n" % x), |
29 |
> noiselevel=-1) self._dynamic_config._skip_restart = True return 0, |
30 |
> myfavorites |
31 |
> - elif os.path.realpath(x) != \ |
32 |
> - |
33 |
> os.path.realpath(bindb.bintree.getname(mykey)): |
34 |
> - writemsg(colorize("BAD", |
35 |
> "\n*** You need to adjust PKGDIR to emerge this package.\n\n"), |
36 |
> noiselevel=-1) + |
37 |
> + x = os.path.realpath(x) |
38 |
> + for pkg in |
39 |
> self._iter_match_pkgs(root_config, "binary", Atom('=%s' % mykey)): |
40 |
> + if x == |
41 |
> os.path.realpath(bindb.bintree.getname(pkg.cpv)): |
42 |
> + break |
43 |
> + else: |
44 |
> + writemsg("\n%s\n\n" % |
45 |
> colorize("BAD", |
46 |
> + _("*** You need to |
47 |
> adjust PKGDIR to emerge " |
48 |
> + "this package: %s") |
49 |
> % x), noiselevel=-1) self._dynamic_config._skip_restart = True |
50 |
> return 0, myfavorites |
51 |
> |
52 |
> - pkg = self._pkg(mykey, "binary", |
53 |
> root_config, |
54 |
> - onlydeps=onlydeps) |
55 |
> args.append(PackageArg(arg=x, |
56 |
> package=pkg, root_config=root_config)) |
57 |
> elif ext==".ebuild": |
58 |
|
59 |
looks fine :) |
60 |
|
61 |
-- |
62 |
Brian Dolbec <dolsen> |