From owner-freebsd-stable  Tue Aug  6 15:29:23 2002
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0B6E137B400
	for <freebsd-stable@freebsd.org>; Tue,  6 Aug 2002 15:29:20 -0700 (PDT)
Received: from ma103.mailarmory.com (ma103.mailarmory.com [216.17.222.195])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9DCF843E7B
	for <freebsd-stable@freebsd.org>; Tue,  6 Aug 2002 15:29:19 -0700 (PDT)
	(envelope-from clayton@frii.net)
Received: from localhost.localdomain (localhost.frii.com [127.0.0.1])
	by localhost.mailarmory.com (Postfix) with ESMTP id 313F576949
	for <freebsd-stable@freebsd.org>; Tue,  6 Aug 2002 16:29:19 -0600 (MDT)
Received: from deimos.frii.net (deimos.frii.com [216.17.128.2])
	by ma103.mailarmory.com (Postfix) with ESMTP id CBD7D7689F
	for <freebsd-stable@freebsd.org>; Tue,  6 Aug 2002 16:29:18 -0600 (MDT)
Received: from elara.frii.com (elara.frii.com [216.17.128.9])
	by deimos.frii.net (8.12.5/8.12.5) with ESMTP id g76MTII5075893
	for <freebsd-stable@freebsd.org>; Tue, 6 Aug 2002 16:29:18 -0600 (MDT)
Date: Tue, 6 Aug 2002 16:29:18 -0600 (MDT)
From: "C.J." <clayton@frii.net>
X-X-Sender: clayton@elara.frii.com
To: freebsd-stable@freebsd.org
Subject: /bin/sh changed?
Message-ID: <Pine.BSF.4.44.0208061621470.93936-100000@elara.frii.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-stable.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-stable>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-stable>
X-Loop: FreeBSD.ORG

cvsup @11:45MDT - RELENG_4

Noticed quite by accident:

root@host (/root) # /usr/libexec/locate.updatedb
/usr/libexec/locate.mklocatedb: 87: Syntax error: "||" unexpected

From /usr/libexec/locate.mklocatedb line 87:

perl -ne '/^\s*[0-9]+\s(..)$/ && print $1 || exit 1' > $bigrams
	|| exit 1

It looks as if, by my extremely limited knowledge of /bin/sh, if you wrap
the || statement down to the next line the shell can no longer understand
since conjoining these two lines solves the problem.  I can see where this
is going to be a huge pain in the butt on the rest of my boxes.  Was this
change intentional?


- C.J.


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message