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 A6BA71381F3 for ; Fri, 23 Aug 2013 13:52:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15A60E0C1E; Fri, 23 Aug 2013 13:52:04 +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 95257E0C1B for ; Fri, 23 Aug 2013 13:52:03 +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 9E37133EB08 for ; Fri, 23 Aug 2013 13:52:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2F09FE5465 for ; Fri, 23 Aug 2013 13:52:00 +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: <1377256485.2f2f33a397e8fe22cafe701e02ff2d234fbf8758.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/core.py X-VCS-Directories: roverlay/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 2f2f33a397e8fe22cafe701e02ff2d234fbf8758 X-VCS-Branch: master Date: Fri, 23 Aug 2013 13:52:00 +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: 847ca02b-e037-4b73-aa92-7571e96b66bc X-Archives-Hash: a840da7ea8c4d0f2ee39fb9e5baf5417 commit: 2f2f33a397e8fe22cafe701e02ff2d234fbf8758 Author: André Erdmann mailerd de> AuthorDate: Fri Aug 23 11:14:45 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Fri Aug 23 11:14:45 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=2f2f33a3 roverlay/core: clean up locate_config_file() --- roverlay/core.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/roverlay/core.py b/roverlay/core.py index 8430fd9..2872c48 100644 --- a/roverlay/core.py +++ b/roverlay/core.py @@ -138,7 +138,6 @@ def load_config_file ( def locate_config_file ( ROVERLAY_INSTALLED, CONFIG_FILE_NAME=DEFAULT_CONFIG_FILE_NAME ): - DEFAULT_CONFIG_FILE = None # search for the config file if roverlay has been installed if ROVERLAY_INSTALLED: cfg = None @@ -147,14 +146,12 @@ def locate_config_file ( for config_dir in CONFIG_DIRS: cfg = config_dir + os.sep + CONFIG_FILE_NAME if os.path.isfile ( cfg ): - DEFAULT_CONFIG_FILE = cfg - break + return cfg - del config_dir, cfg elif os.path.exists ( CONFIG_FILE_NAME ): - DEFAULT_CONFIG_FILE = CONFIG_FILE_NAME + return CONFIG_FILE_NAME - return DEFAULT_CONFIG_FILE + return None # --- end of locate_config_file (...) --- def load_locate_config_file ( @@ -181,6 +178,7 @@ def default_helper_setup ( ROVERLAY_INSTALLED, log_to_console=True ): ROVERLAY_INSTALLED, extraconf={ 'installed': ROVERLAY_INSTALLED, }, setup_logger=False, load_main_only=True, ) + roverlay.tools.shenv.setup_env() return config # --- end of default_helper_setup (...) ---