Return-Path: X-Original-To: apmail-couchdb-dev-archive@www.apache.org Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 53A9FC156 for ; Mon, 30 Apr 2012 18:12:30 +0000 (UTC) Received: (qmail 94320 invoked by uid 500); 30 Apr 2012 18:12:29 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 94234 invoked by uid 500); 30 Apr 2012 18:12:29 -0000 Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list dev@couchdb.apache.org Received: (qmail 94219 invoked by uid 99); 30 Apr 2012 18:12:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Apr 2012 18:12:29 +0000 X-ASF-Spam-Status: No, hits=0.7 required=5.0 tests=SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [80.244.253.218] (HELO mail.traeumt.net) (80.244.253.218) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Apr 2012 18:12:23 +0000 Received: from [192.168.2.62] (unknown [178.250.115.206]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mail.traeumt.net (Postfix) with ESMTPSA id 05EF81411A; Mon, 30 Apr 2012 20:13:30 +0200 (CEST) Subject: Re: git commit: Revert "Revert "Revert "Make sure that local_dev.ini is writable""" Mime-Version: 1.0 (Apple Message framework v1257) Content-Type: text/plain; charset=iso-8859-1 From: Jan Lehnardt In-Reply-To: Date: Mon, 30 Apr 2012 19:12:00 +0100 Cc: commits@couchdb.apache.org Content-Transfer-Encoding: quoted-printable Message-Id: <8BD32AA6-9016-4222-9147-3409F10AA62B@apache.org> References: <20120430112331.80D8711FD3@tyr.zones.apache.org> <24D45913-95AF-4D7D-AC27-BCDB736551EF@apache.org> To: dev@couchdb.apache.org X-Mailer: Apple Mail (2.1257) X-Virus-Checked: Checked by ClamAV on apache.org On Apr 30, 2012, at 18:43 , Paul Davis wrote: > On Mon, Apr 30, 2012 at 11:35 AM, Jan Lehnardt wrote: >>=20 >> On Apr 30, 2012, at 17:26 , Paul Davis wrote: >>=20 >>> This series of commits confuses me greatly. >>=20 >> Sorry. >>=20 >>> There are a lot of reverts >>=20 >> The sequence is this: >>=20 >> You added chmod +w. >> I reverted chmod +w. >> I accidentally added chmod +w, but called it "Revert" (i.e. this = commit should never have been pushed) >> I reverted the previous commit, effectively removing chmod +w, adding = another "Revert" for funsies. >>=20 >=20 > Ahh, gotchya. :D >=20 >>> and the explanation of it breaking compilation from read only media = is >>> incorrect. >>=20 >> Why is the explanation incorrect? >>=20 >=20 > VPATH builds have a read-only source directory and a read/writable > build directory. The source directory must remain read only. Any build > products can be writable. local_dev.ini is a build product (albeit a > very simple build). In our normal non-VPATH builds we rely on > local.ini (the "source" of the local_dev.ini build product) to have > correct permissions when local_dev.ini is created (because it copies > them) so that tests and ./utils/run work correctly. >=20 > When we run the VPATH build, it creates a read-only version of > local.ini which then ends up affecting the file permissions of > local_dev.ini which is built in the build directory. This is a bug in > that we don't explicitly specify the permissions of local_dev.ini, > hence the chmod. This is perfectly acceptable because local_dev.ini is > built in the build directory where files can be writable. >=20 >>> This file should be writable or ./utils/run in a VPATH build can't >>> edit its configuration which is incorrect. >>=20 >> Then we can't use utils/run to start CouchDB to run the JS tests = against in make [dist]check. What alternative would you recommend? >>=20 >=20 > We can. It works. You can tell because make distcheck works when > local_dev.ini is writable. >=20 >>=20 >>> Also it breaks the tests. >>=20 >> Yes, as I said in the previous mail, I'm trying find a fix that = doesn't require writing to local_dev.ini when running the tests. >>=20 >=20 > I had the same impulse at first. But then I realized that we do in > fact want local_dev.ini to be writable regardless of what this test > does. We could be super pure and never change the configuration for > unit tests in which case I would say keep looking for a solution if > you're so inclined. Regardless of whether we find a solution > local_dev.ini should remain writable because normal operation requires > the last file of the configuration chain to be writable. Making > local_dev.ini read-only is forcing make dev to produce a broken > development environment. >=20 > Also, it occurs to me that a solution to make it more pure would be to > just append a value for that setting when local_dev.ini is generated. > Ie: >=20 > echo "[stuff]\nkey =3D $VALUE\n" >> local_dev.ini Pitch perfect summary, thanks for making your thought process clear! +1 then on in fact doing the chmod +w. Do you want to have the=20 honours, again? :) Cheers Jan >=20 >> Cheers >> Jan >> -- >>=20 >>=20 >>=20 >>=20 >>>=20 >>> On Mon, Apr 30, 2012 at 6:24 AM, Jan Lehnardt = wrote: >>>> Sorry :) >>>>=20 >>>> On Apr 30, 2012, at 12:23 , jan@apache.org wrote: >>>>=20 >>>>> Updated Branches: >>>>> refs/heads/master bdcfcca1e -> 9acc34ed9 >>>>>=20 >>>>>=20 >>>>> Revert "Revert "Revert "Make sure that local_dev.ini is = writable""" >>>>>=20 >>>>> Revert. Git <3. >>>>>=20 >>>>> This reverts commit bdcfcca1ec92f379e5376741e5ab103630573ac4. >>>>>=20 >>>>>=20 >>>>> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo >>>>> Commit: = http://git-wip-us.apache.org/repos/asf/couchdb/commit/9acc34ed >>>>> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9acc34ed >>>>> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9acc34ed >>>>>=20 >>>>> Branch: refs/heads/master >>>>> Commit: 9acc34ed9ed4315f7cd6f5b8ac45e47f2c0b8cb6 >>>>> Parents: bdcfcca1 >>>>> Author: Jan Lehnardt >>>>> Authored: Mon Apr 30 12:23:00 2012 +0100 >>>>> Committer: Jan Lehnardt >>>>> Committed: Mon Apr 30 12:23:00 2012 +0100 >>>>>=20 >>>>> = ---------------------------------------------------------------------- >>>>> etc/couchdb/Makefile.am | 1 - >>>>> 1 files changed, 0 insertions(+), 1 deletions(-) >>>>> = ---------------------------------------------------------------------- >>>>>=20 >>>>>=20 >>>>> = http://git-wip-us.apache.org/repos/asf/couchdb/blob/9acc34ed/etc/couchdb/M= akefile.am >>>>> = ---------------------------------------------------------------------- >>>>> diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am >>>>> index fe045f9..dd1054b 100644 >>>>> --- a/etc/couchdb/Makefile.am >>>>> +++ b/etc/couchdb/Makefile.am >>>>> @@ -73,7 +73,6 @@ default_dev.ini: default.ini.tpl >>>>> local_dev.ini: local.ini >>>>> if test ! -f "$@"; then \ >>>>> cp $< $@; \ >>>>> - chmod +w $@; \ >>>>> fi >>>>>=20 >>>>> install-data-hook: >>>>>=20 >>>>=20 >>=20