| 1 |
commit: 8c9b1d6a7c115344cdc5bd8e7d122ab721aeb53a |
| 2 |
Author: Alexander Berntsen <bernalex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 27 08:51:25 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 29 23:03:17 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8c9b1d6a |
| 7 |
|
| 8 |
Clarify no binary packages error (bug 573070) |
| 9 |
|
| 10 |
Make emerge specify that it did not find any *binary packages* when |
| 11 |
--usepkg is active, as opposed to that it did not find any *ebuilds*, as |
| 12 |
this was confusing behaviour. |
| 13 |
|
| 14 |
X-Gentoo-Bug: 573070 |
| 15 |
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=573070 |
| 16 |
|
| 17 |
Signed-off-by: Alexander Berntsen <bernalex <AT> gentoo.org> |
| 18 |
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 19 |
|
| 20 |
pym/_emerge/depgraph.py | 5 ++++- |
| 21 |
1 file changed, 4 insertions(+), 1 deletion(-) |
| 22 |
|
| 23 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 24 |
index d971749..05d1da5 100644 |
| 25 |
--- a/pym/_emerge/depgraph.py |
| 26 |
+++ b/pym/_emerge/depgraph.py |
| 27 |
@@ -5125,7 +5125,10 @@ class depgraph(object): |
| 28 |
cp_exists = True |
| 29 |
break |
| 30 |
|
| 31 |
- writemsg("\nemerge: there are no ebuilds to satisfy "+green(xinfo)+".\n", noiselevel=-1) |
| 32 |
+ writemsg("\nemerge: there are no %s to satisfy " % |
| 33 |
+ ("binary packages" if |
| 34 |
+ self._frozen_config.myopts.get("--usepkgonly", "y") == True |
| 35 |
+ else "ebuilds") + green(xinfo) + ".\n", noiselevel=-1) |
| 36 |
if isinstance(myparent, AtomArg) and \ |
| 37 |
not cp_exists and \ |
| 38 |
self._frozen_config.myopts.get( |
Archives