From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-catalyst+bounces-2622-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id BEB54198005
	for <garchives@archives.gentoo.org>; Fri,  1 Mar 2013 06:07:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 4649EE07C6;
	Fri,  1 Mar 2013 06:07:01 +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 BFEC1E07C6
	for <gentoo-catalyst@lists.gentoo.org>; Fri,  1 Mar 2013 06:07:00 +0000 (UTC)
Received: from mail-gh0-f181.google.com (mail-gh0-f181.google.com [209.85.160.181])
	(using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
	(No client certificate requested)
	(Authenticated sender: mattst88)
	by smtp.gentoo.org (Postfix) with ESMTPSA id DD12F33DD07
	for <gentoo-catalyst@lists.gentoo.org>; Fri,  1 Mar 2013 06:06:59 +0000 (UTC)
Received: by mail-gh0-f181.google.com with SMTP id y8so412606ghb.40
        for <gentoo-catalyst@lists.gentoo.org>; Thu, 28 Feb 2013 22:06:58 -0800 (PST)
X-Received: by 10.236.148.164 with SMTP id v24mr6677906yhj.116.1362118018377;
 Thu, 28 Feb 2013 22:06:58 -0800 (PST)
Precedence: bulk
List-Post: <mailto:gentoo-catalyst@lists.gentoo.org>
List-Help: <mailto:gentoo-catalyst+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-catalyst+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-catalyst+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-catalyst.gentoo.org>
X-BeenThere: gentoo-catalyst@lists.gentoo.org
Reply-to: gentoo-catalyst@lists.gentoo.org
MIME-Version: 1.0
Received: by 10.100.59.14 with HTTP; Thu, 28 Feb 2013 22:06:38 -0800 (PST)
In-Reply-To: <11de1a8a9dadcfe6f408a3b0f868db6940931af1.1362117274.git.wking@tremily.us>
References: <ef57259e9e570a51d126c1859a8d1ba85db4554a.1360442556.git.wking@tremily.us>
 <11de1a8a9dadcfe6f408a3b0f868db6940931af1.1362117274.git.wking@tremily.us>
From: Matt Turner <mattst88@gentoo.org>
Date: Thu, 28 Feb 2013 22:06:38 -0800
Message-ID: <CAEdQ38HzyULH=8xXUNgQTxEF+6zP6dE8PUQV4K3kDnyX2O3ZvQ@mail.gmail.com>
Subject: Re: [gentoo-catalyst] [PATCH] kmerge.sh: Fix line wrapping typo from 9ceebbf
To: gentoo-catalyst@lists.gentoo.org
Cc: "W. Trevor King" <wking@tremily.us>
Content-Type: text/plain; charset=ISO-8859-1
X-Archives-Salt: c0b6c740-881e-48aa-82ae-7a1ac5b3a2a6
X-Archives-Hash: 01e4bd392cba5a5e491959e478f12739

On Thu, Feb 28, 2013 at 9:57 PM, W. Trevor King <wking@tremily.us> wrote:
> From: "W. Trevor King" <wking@tremily.us>
>
> 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
>
>

Thanks, pushed!