From owner-svn-src-all@FreeBSD.ORG  Mon Jan  9 12:49:58 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 763E8106566C;
	Mon,  9 Jan 2012 12:49:58 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net
	[IPv6:2001:7b8:2ff:146::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 339B28FC0C;
	Mon,  9 Jan 2012 12:49:58 +0000 (UTC)
Received: from [IPv6:2001:7b8:3a7:0:d01c:cec7:e367:727] (unknown
	[IPv6:2001:7b8:3a7:0:d01c:cec7:e367:727])
	(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by tensor.andric.com (Postfix) with ESMTPSA id 1756A5C37;
	Mon,  9 Jan 2012 13:49:57 +0100 (CET)
Message-ID: <4F0AE274.8010907@FreeBSD.org>
Date: Mon, 09 Jan 2012 13:49:56 +0100
From: Dimitry Andric <dim@FreeBSD.org>
Organization: The FreeBSD Project
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
	rv:10.0) Gecko/20120106 Thunderbird/10.0
MIME-Version: 1.0
To: Sergey Kandaurov <pluknet@freebsd.org>
References: <201112300624.pBU6OxO9098906@svn.freebsd.org>
	<4F08A518.8090207@FreeBSD.org>
	<CAE-mSOJS5a+xCTFmtUL3R+3VZJupgDo7eFbAc70wmtWRW6s-3Q@mail.gmail.com>
In-Reply-To: <CAE-mSOJS5a+xCTFmtUL3R+3VZJupgDo7eFbAc70wmtWRW6s-3Q@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, Devin Teske <devin.teske@fisglobal.com>
Subject: Re: svn commit: r228985 - head/sys/boot/forth
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jan 2012 12:49:58 -0000

On 2012-01-08 21:35, Sergey Kandaurov wrote:
...
> So, the problem arise when beastie_disable is set.
>
> In this case menu.rc is not evaluated and consequently menu-unset does
> not have a body yet. This results in the ficl warning "not found" when
> try-menu-unset calls menu-unset. The warning cannot be handled with catch
> as seen with the code in head.
> Otherwise, when beastie is enabled, all works as it should.
>
> To "fix" the problem I replaced 'catch' with 'sfind', so that we can
> conditionally call menu-unset only when the definition is present.
>
> Please try the following patch. I tested it with enabled/disabled beastie
> and loader_color over serial console. I would also like to get a review
> from Devin Teske to see if this change is acceptable.

Yes, this patch makes the warning disappear.  Thanks!