X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id ABDD2DC737B for ; Fri, 5 Jul 2013 04:21:56 +0000 (UTC) Received: from compute1.internal (compute1.nyi.mail.srv.osa [10.202.2.41]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id D60F7202A9 for ; Fri, 5 Jul 2013 00:21:55 -0400 (EDT) Received: from frontend2.nyi.mail.srv.osa ([10.202.2.161]) by compute1.internal (MEProxy); Fri, 05 Jul 2013 00:21:55 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=from:to:subject:date:message-id :in-reply-to:references; s=smtpout; bh=1f5X642ZNz694NHEIIdeS2Akg m8=; b=quMbFSFNEHBfJwXOUs2kqDtxgjENxx5nIJZBC/T/268yi0NcXyrsZ6+Oq 9QVTRvXXGAIyA7yMEPpJolAucR2LgLc2MV/EG35oeFLBsvDaqDA9Uv+ltMO58k/0 541O4zDgobhrKyr8YUCwon5Zkw0kXLIIxJFkcOuoXQXe+JNLkE= X-Sasl-enc: qpEMD84i4p1RefNHawhxDrJfREuL389NpzxLCQT5CkG/ 1372998115 Received: from localhost (unknown [69.86.161.244]) by mail.messagingengine.com (Postfix) with ESMTPA id A9FDA680204 for ; Fri, 5 Jul 2013 00:21:55 -0400 (EDT) From: Dubiousjim To: alpine-devel@lists.alpinelinux.org Subject: [alpine-devel] [PATCH 31/31] functions: also honor .abuild file at gitbase Date: Fri, 5 Jul 2013 00:21:40 -0400 Message-Id: <5891f099176705b11a8ff0be91e9c7a0e0deb20a.1372997335.git.dubiousjim@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: This permits introducing branch-specific modifications to abuild.conf settings. Any settings there override /etc/abuild.conf and $HOME/.abuild/abuild.conf. --- functions.sh.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/functions.sh.in b/functions.sh.in index 0b0bc3b..395e407 100644 --- a/functions.sh.in +++ b/functions.sh.in @@ -46,6 +46,8 @@ readconfig() { APORTSDIR= fi fi + # source any .abuild file at the aports root, but only if we are currently in aports tree + [ -n "$APORTSDIR" ] && [ -f "$APORTSDIR/.abuild" ] && [ "$APORTSDIR" = "$gitbase" ] && . "$APORTSDIR/.abuild" BUILDDIR=${_BUILDDIR-$BUILDDIR} PKGDEST=${_PKGDEST-$PKGDEST} SRCPKGDEST=${_SRCPKGDEST-$SRCPKGDEST} -- 1.8.3.1 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---