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 0CE291389F5 for ; Fri, 31 Oct 2014 01:56:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CDE43E086C; Fri, 31 Oct 2014 01:56:55 +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 5162BE0879 for ; Fri, 31 Oct 2014 01:56:55 +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 218783404AF for ; Fri, 31 Oct 2014 01:56:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C1F2E91C1 for ; Fri, 31 Oct 2014 01:56:52 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1414717455.d3264b37b65a81045cd7a0d0daf5b52f1af1c335.vapier@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: wrappers/ X-VCS-Repository: proj/crossdev X-VCS-Files: wrappers/emerge-wrapper X-VCS-Directories: wrappers/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: d3264b37b65a81045cd7a0d0daf5b52f1af1c335 X-VCS-Branch: master Date: Fri, 31 Oct 2014 01:56: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: 24dafbce-be32-448a-8541-bfbf0d86ee28 X-Archives-Hash: fc069b12a005462d1e4e1ba48aa272fc commit: d3264b37b65a81045cd7a0d0daf5b52f1af1c335 Author: Mike Frysinger gentoo org> AuthorDate: Fri Oct 31 01:04:15 2014 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Fri Oct 31 01:04:15 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=d3264b37 emerge-wrapper: improve warning messages The current output isn't clear as to what is wrong. Signed-off-by: Mike Frysinger gentoo.org> --- wrappers/emerge-wrapper | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper index 154d82e..9ba46b4 100755 --- a/wrappers/emerge-wrapper +++ b/wrappers/emerge-wrapper @@ -21,11 +21,13 @@ err() { echo "emerge-wrapper: $*" 1>&2; exit 1; } emit_setup_warning() { - ${setup_warning:-false} && return 0 - setup_warning=true - echo "!!! WARNING - Cannot auto-configure CHOST ${CHOST}" - echo "!!! You should edit ${conf}" - echo "!!! by hand to complete your configuration" + if ! ${setup_warning} ; then + setup_warning=true + echo "!!! WARNING - Cannot auto-configure CHOST ${CHOST};" + echo "!!! You should edit ${conf}" + echo "!!! by hand to complete your configuration." + fi + echo "!!! $*" } cross_wrap_etc() @@ -44,13 +46,13 @@ cross_wrap_etc() . "${MAIN_REPO_PATH}"/eclass/toolchain-funcs.eclass tc-arch ) - [[ ${ARCH} == "unknown" ]] && emit_setup_warning + [[ ${ARCH} == "unknown" ]] && emit_setup_warning "No ARCH is known for this target." LIBC="__LIBC__" case ${CHOST} in *gnu*) LIBC=glibc ;; *uclibc*) LIBC=uclibc ;; - *) emit_setup_warning ;; + *) emit_setup_warning "No LIBC is known for this target." ;; esac sed -i \