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