From owner-svn-src-all@FreeBSD.ORG Sat May 5 09:13:42 2012 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5B323106566C; Sat, 5 May 2012 09:13:42 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail17.syd.optusnet.com.au (mail17.syd.optusnet.com.au [211.29.132.198]) by mx1.freebsd.org (Postfix) with ESMTP id E83048FC0C; Sat, 5 May 2012 09:13:41 +0000 (UTC) Received: from c122-106-171-232.carlnfd1.nsw.optusnet.com.au (c122-106-171-232.carlnfd1.nsw.optusnet.com.au [122.106.171.232]) by mail17.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id q459DXEe017745 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 5 May 2012 19:13:34 +1000 Date: Sat, 5 May 2012 19:13:33 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Pawel Jakub Dawidek In-Reply-To: <20120504185743.GA1397@garage.freebsd.pl> Message-ID: <20120505185603.G1113@besplex.bde.org> References: <201203242110.q2OLAJSZ049045@svn.freebsd.org> <20120504185743.GA1397@garage.freebsd.pl> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Eitan Adler Subject: Re: svn commit: r233435 - head/etc/mtree 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 May 2012 09:13:42 -0000 On Fri, 4 May 2012, Pawel Jakub Dawidek wrote: > On Sat, Mar 24, 2012 at 09:10:19PM +0000, Eitan Adler wrote: >> Log: >> Fix build by adding new directory to mtree in r233429 >> >> Submitted by: flo >> Approved by: cperciva >> MFC after: 1 week >> >> Modified: >> head/etc/mtree/BSD.usr.dist >> >> Modified: head/etc/mtree/BSD.usr.dist >> ============================================================================== >> --- head/etc/mtree/BSD.usr.dist Sat Mar 24 19:59:14 2012 (r233434) >> +++ head/etc/mtree/BSD.usr.dist Sat Mar 24 21:10:19 2012 (r233435) >> @@ -209,6 +209,8 @@ >> .. >> bootforth >> .. >> + csh >> + .. >> cvs > > You need to use only spaces in this file for indentation just like in > all the other lines. That's a shame it was merged into 7, 8 and 9. Of course, it doesn't help that mtree files are among the few whose formatting style is specified in detail (in mtree/README). BSD.usr.dist is the only one that has any tabs (82 lines out of 1364). Other misformattings are harder to grep for, but unlikely to be null. A relatively serious ones (equivalent to leaving out necessary braces for a compound statement in C) is visible in the above: the tab for the ".." for csh is not just a style bug, but misindents to an extra level, so the level can't be read off from the indentation. This is without spurious indentation from mailer quoting or tab mis-expansion; in this reply, the mailer quoting combined with only some lines using tabs makes it look like "csh" is missing indentation instead of its ".." having extra indentation. The strings are "<4 spaces>csh" and .." but should be "<12 spaces>" for both.) There is no indent(1) for mtree files, but the README has instructions for producing the correct formatting by running mtree(1) with suitable options. Bruce