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