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 AD9F3198005 for ; Fri, 1 Mar 2013 05:57:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A523E0773; Fri, 1 Mar 2013 05:57:47 +0000 (UTC) Received: from vms173003pub.verizon.net (vms173003pub.verizon.net [206.46.173.3]) by pigeon.gentoo.org (Postfix) with ESMTP id 1ECF7E0773 for ; Fri, 1 Mar 2013 05:57:47 +0000 (UTC) Received: from odin.tremily.us ([unknown] [72.68.84.219]) by vms173003.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MIY008ABWK7YK40@vms173003.mailsrvcs.net> for gentoo-catalyst@lists.gentoo.org; Thu, 28 Feb 2013 23:57:44 -0600 (CST) Received: by odin.tremily.us (Postfix, from userid 1000) id 7584D8E82C0; Fri, 01 Mar 2013 00:57:42 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1362117462; bh=Z5vz7+qXuv2aPdmA1LSuEpTf3DFLio03AfiksIIzteY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jG3/ZfVCuR4kZrJ3+D2KxtaIAU3TQe4NVGpomU2HO7N5y2cu6zWH65CyydSSWBAe+ r1GoXgS+xkQwIzZJVAY0W5iB71DDrczClKXVK4h39RR0nFyvxuOkQllMXBZBGwFuCS KjqYm/Xfy9IaXSr1/PoItf2A5+f7OBs4Hbxjs7pQ= From: "W. Trevor King" To: Catalyst Cc: Matt Turner , "W. Trevor King" Subject: [gentoo-catalyst] [PATCH] kmerge.sh: Fix line wrapping typo from 9ceebbf Date: Fri, 01 Mar 2013 00:57:39 -0500 Message-id: <11de1a8a9dadcfe6f408a3b0f868db6940931af1.1362117274.git.wking@tremily.us> X-Mailer: git-send-email 1.7.12.4 In-reply-to: References: Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: 7e4b1445-0da3-4bf7-aaba-938f205ed894 X-Archives-Hash: 7711ad1ec7ff2f1ba8e7d28e5cbc9834 From: "W. Trevor King" In 9ceebbf (kmerge.sh: Make /var/tmp/${clst_kname}.config optional, 2013-02-09), I added a KERNCACHE check to a `[` test, wrapping the two clauses in the test to avoid a very long line. Unfortunately, newlines do not appear to be legal in this position. For example: $ if [ -n "a" -a > -n "b" ]; then echo "c"; fi bash: [: missing `]' bash: -n: command not found This commit fixes the error by explicitly wrapping the line with a backslash. --- targets/support/kmerge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index ce1dddf..e78e0b4 100644 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -180,7 +180,7 @@ then fi CONFIG_MATCH=0 -if [ -n "${clst_KERNCACHE}" -a +if [ -n "${clst_KERNCACHE}" -a \ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ] then if [ ! -e /var/tmp/${clst_kname}.config ] -- 1.8.2.rc0.16.g20a599e