Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 May 2012 19:13:33 +1000 (EST)
From:      Bruce Evans <brde@optusnet.com.au>
To:        Pawel Jakub Dawidek <pjd@FreeBSD.org>
Cc:        svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Eitan Adler <eadler@FreeBSD.org>
Subject:   Re: svn commit: r233435 - head/etc/mtree
Message-ID:  <20120505185603.G1113@besplex.bde.org>
In-Reply-To: <20120504185743.GA1397@garage.freebsd.pl>
References:  <201203242110.q2OLAJSZ049045@svn.freebsd.org> <20120504185743.GA1397@garage.freebsd.pl>

next in thread | previous in thread | raw e-mail | index | archive | help
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 "<bogus-tab><4 spaces>csh" and
<bogus-tab><bogus-and-broken-tab>.." but should be "<12 spaces><etc>"
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120505185603.G1113>