From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5389758974 for ; Thu, 28 Jan 2016 11:54:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 063BD21C001; Thu, 28 Jan 2016 11:54:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AC5B721C001 for ; Thu, 28 Jan 2016 11:54:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD429340A9F for ; Thu, 28 Jan 2016 11:54:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6C818DA for ; Thu, 28 Jan 2016 11:54:16 +0000 (UTC) From: "Alexander Berntsen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexander Berntsen" Message-ID: <1453981858.9c9165fb9420a285e8e2c62cb9ba8eb91120cb66.bernalex@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: bernalex X-VCS-Committer-Name: Alexander Berntsen X-VCS-Revision: 9c9165fb9420a285e8e2c62cb9ba8eb91120cb66 X-VCS-Branch: master Date: Thu, 28 Jan 2016 11:54:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: afd04fe2-28e7-4f5f-88b1-555b2ec12b24 X-Archives-Hash: 1f2d5e6f07843093f02856054aed0908 commit: 9c9165fb9420a285e8e2c62cb9ba8eb91120cb66 Author: Alexander Berntsen gentoo org> AuthorDate: Wed Jan 27 08:51:25 2016 +0000 Commit: Alexander Berntsen gentoo org> CommitDate: Thu Jan 28 11:50:58 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9c9165fb Clarify no binary packages error (bug 573070) Make emerge specify that it did not find any *binary packages* when --usepkg is active, as opposed to that it did not find any *ebuilds*, as this was confusing behaviour. X-Gentoo-Bug: 573070 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=573070 Signed-off-by: Alexander Berntsen gentoo.org> Acked-by: Brian Dolbec gentoo.org> pym/_emerge/depgraph.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index d971749..05d1da5 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5125,7 +5125,10 @@ class depgraph(object): cp_exists = True break - writemsg("\nemerge: there are no ebuilds to satisfy "+green(xinfo)+".\n", noiselevel=-1) + writemsg("\nemerge: there are no %s to satisfy " % + ("binary packages" if + self._frozen_config.myopts.get("--usepkgonly", "y") == True + else "ebuilds") + green(xinfo) + ".\n", noiselevel=-1) if isinstance(myparent, AtomArg) and \ not cp_exists and \ self._frozen_config.myopts.get( From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 88BB858975 for ; Fri, 29 Jan 2016 11:17:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 923C9E0848; Fri, 29 Jan 2016 11:17:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DCA8FE0835 for ; Fri, 29 Jan 2016 11:17:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC71E340C08 for ; Fri, 29 Jan 2016 11:17:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A65918DA for ; Fri, 29 Jan 2016 11:17:52 +0000 (UTC) From: "Alexander Berntsen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexander Berntsen" Message-ID: <1453981858.9c9165fb9420a285e8e2c62cb9ba8eb91120cb66.bernalex@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: bernalex X-VCS-Committer-Name: Alexander Berntsen X-VCS-Revision: 9c9165fb9420a285e8e2c62cb9ba8eb91120cb66 X-VCS-Branch: master Date: Fri, 29 Jan 2016 11:17:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fed027bb-a9f7-459a-be4d-b711b25d9a04 X-Archives-Hash: bed0b79b338a1031bc0f0341451c80ba Message-ID: <20160129111752.p5zYylL9mrOW3ZpjEeHFW4TR8x5Tqfq6GIe9tX1qfQ8@z> commit: 9c9165fb9420a285e8e2c62cb9ba8eb91120cb66 Author: Alexander Berntsen gentoo org> AuthorDate: Wed Jan 27 08:51:25 2016 +0000 Commit: Alexander Berntsen gentoo org> CommitDate: Thu Jan 28 11:50:58 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9c9165fb Clarify no binary packages error (bug 573070) Make emerge specify that it did not find any *binary packages* when --usepkg is active, as opposed to that it did not find any *ebuilds*, as this was confusing behaviour. X-Gentoo-Bug: 573070 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=573070 Signed-off-by: Alexander Berntsen gentoo.org> Acked-by: Brian Dolbec gentoo.org> pym/_emerge/depgraph.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index d971749..05d1da5 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5125,7 +5125,10 @@ class depgraph(object): cp_exists = True break - writemsg("\nemerge: there are no ebuilds to satisfy "+green(xinfo)+".\n", noiselevel=-1) + writemsg("\nemerge: there are no %s to satisfy " % + ("binary packages" if + self._frozen_config.myopts.get("--usepkgonly", "y") == True + else "ebuilds") + green(xinfo) + ".\n", noiselevel=-1) if isinstance(myparent, AtomArg) and \ not cp_exists and \ self._frozen_config.myopts.get(