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 0D309138697 for ; Sat, 26 Jan 2013 00:23:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 023B121C01D; Sat, 26 Jan 2013 00:23:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4917921C01D for ; Sat, 26 Jan 2013 00:23:10 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 56DC333DE07 for ; Sat, 26 Jan 2013 00:23:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EE0C7E4079 for ; Sat, 26 Jan 2013 00:23:07 +0000 (UTC) From: "Diego Elio Pettenò" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Diego Elio Pettenò" Message-ID: <1359159760.45eb2725e20af40caf07c81e582402eb382e6d47.flameeyes@gentoo> Subject: [gentoo-commits] proj/flameeyes-tinderbox:master commit in: / X-VCS-Repository: proj/flameeyes-tinderbox X-VCS-Files: emerge-wrapper.sh X-VCS-Directories: / X-VCS-Committer: flameeyes X-VCS-Committer-Name: Diego Elio Pettenò X-VCS-Revision: 45eb2725e20af40caf07c81e582402eb382e6d47 X-VCS-Branch: master Date: Sat, 26 Jan 2013 00:23:07 +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: 1ec76de4-356a-4e3c-b315-53beb86a2b4f X-Archives-Hash: fc21acf25a7c5c6731ca721a5459f69e commit: 45eb2725e20af40caf07c81e582402eb382e6d47 Author: Diego Elio Pettenò flameeyes eu> AuthorDate: Sat Jan 26 00:22:40 2013 +0000 Commit: Diego Elio Pettenò gentoo org> CommitDate: Sat Jan 26 00:22:40 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/flameeyes-tinderbox.git;a=commit;h=45eb2725 Try running the merge with USE=-doc first, then fall back to FEATURES=-test. --- emerge-wrapper.sh | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/emerge-wrapper.sh b/emerge-wrapper.sh index 1bd3ba1..74ac178 100755 --- a/emerge-wrapper.sh +++ b/emerge-wrapper.sh @@ -27,8 +27,8 @@ else dent_me() { :; } fi -# Don't tweet this away if we're running a non-test try -if [[ -z "${FEATURES}" ]]; then +# Don't tweet this away if we're running a second-tier try +if [[ -z "${USE}" ]]; then dent_me "$1 queued" fi @@ -42,9 +42,14 @@ if [[ $res != 0 ]]; then if ! fgrep -q ">>> emerge" /var/log/emerge.log; then # Here it means that the merge was rejected; the common case # it's a cyclic dependency that Portage cannot break, which is - # unfortunately common when enabling tests e.g. with Ruby-NG - # ebuilds. To try recovering from this, try a merge without - # test features enabled. + # unfortunately common when enabling tests or doc, usually + # with Ruby ebuilds, but no longer limited to them. To find a + # way around this, we first check for a build with USE=-doc, + # and then one with FEATURES=-test as well. This does mean + # that we skip the tests on a doc circular dependency + # unfortunately. + if [[ -z "${USE}" ]]; then + USE=-doc $0 "$@" if [[ -z "${FEATURES}" ]]; then FEATURES=-test $0 "$@" else