From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1ShSux-0004ou-B5 for garchives@archives.gentoo.org; Wed, 20 Jun 2012 21:58:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0BB7E0732; Wed, 20 Jun 2012 21:58:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9DF61E0732 for ; Wed, 20 Jun 2012 21:58:14 +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 093731B400B for ; Wed, 20 Jun 2012 21:58:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5C9ADE5435 for ; Wed, 20 Jun 2012 21:58:11 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1340229409.131b3b6718baa058f06d4f0ac8f919f717ae5338.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/misc-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 131b3b6718baa058f06d4f0ac8f919f717ae5338 X-VCS-Branch: master Date: Wed, 20 Jun 2012 21:58:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: fb145b54-dec5-4d26-aa49-dc12324c20cc X-Archives-Hash: 80d5fbd0dd58557a80d2de14d7848c9d commit: 131b3b6718baa058f06d4f0ac8f919f717ae5338 Author: Zac Medico gentoo org> AuthorDate: Wed Jun 20 21:56:49 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Jun 20 21:56:49 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D131b3b67 misc-functions.sh: unwrap die messages Jeremy Olexa gentoo.org> complained that die was not handl= ing these line continuations as it's supposed to. Maybe there's a bug in die's line continuation sed expression, but it won't hurt to unwrap these particular messages. --- bin/misc-functions.sh | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 564af85..9eec8bb 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -773,16 +773,15 @@ install_qa_check() { fi if [[ ${abort} =3D=3D "yes" ]] ; then if [[ $gentoo_bug =3D yes || $always_overflow =3D yes ]] ; then - die "install aborted due to" \ - "severe warnings shown above" + die "install aborted due to severe warnings shown above" else echo "Please do not file a Gentoo bug and instead" \ "report the above QA issues directly to the upstream" \ "developers of this software." | fmt -w 70 | \ while read -r line ; do eqawarn "${line}" ; done eqawarn "Homepage: ${HOMEPAGE}" - has stricter ${FEATURES} && die "install aborted due to" \ - "severe warnings shown above" + has stricter ${FEATURES} && \ + die "install aborted due to severe warnings shown above" fi fi fi