From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6EA22138204 for ; Wed, 4 Sep 2013 10:16:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8187E0D5B; Wed, 4 Sep 2013 10:16:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 849ACE0D5B for ; Wed, 4 Sep 2013 10:16:40 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8CF3233EAC8 for ; Wed, 4 Sep 2013 10:16:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 146C6E545E for ; Wed, 4 Sep 2013 10:16:37 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1378289673.276c823634d7b61a5580dfaae4b7765bf7b89270.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/tools/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/tools/shenv.py X-VCS-Directories: roverlay/tools/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 276c823634d7b61a5580dfaae4b7765bf7b89270 X-VCS-Branch: master Date: Wed, 4 Sep 2013 10:16:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 59948ef6-0596-4c2c-95c9-b57653bc0e40 X-Archives-Hash: 5ff62797144a4f71f8733004aed88be5 commit: 276c823634d7b61a5580dfaae4b7765bf7b89270 Author: André Erdmann mailerd de> AuthorDate: Wed Sep 4 10:14:33 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Wed Sep 4 10:14:33 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=276c8236 roverlay/shenv: fix setup_conf_optional() + add $ROVERLAY_HOOKRC to the shell env --- roverlay/tools/shenv.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roverlay/tools/shenv.py b/roverlay/tools/shenv.py index 1c481b6..1b06ca9 100644 --- a/roverlay/tools/shenv.py +++ b/roverlay/tools/shenv.py @@ -164,7 +164,7 @@ def setup_env(): env [k] = roverlay.config.get_or_fail ( c ) def setup_conf_optional ( k, c, fallback=None ): - value = roverlay.config.get ( k ) + value = roverlay.config.get ( c ) if value is not None: env [k] = value return True @@ -180,8 +180,10 @@ def setup_env(): ## create shell vars - # str::filepath $ROVERLAY_EXE + # str::filepath $ROVERLAY_HOOKRC (optional) + setup_conf_optional ( 'ROVERLAY_HOOKRC', 'EVENT_HOOK.config_file' ) + # str::filepath $ROVERLAY_EXE setup ( 'ROVERLAY_HELPER_EXE', sys.argv[0] ) roverlay_exe = ( os.path.dirname ( sys.argv[0] ) + os.sep + 'roverlay' ) if os.path.isfile ( roverlay_exe + '.py' ):