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 EEC6A138BF3 for ; Mon, 17 Feb 2014 17:22:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5436E09F7; Mon, 17 Feb 2014 17:22:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80094E09F7 for ; Mon, 17 Feb 2014 17:22:39 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6967333F9ED for ; Mon, 17 Feb 2014 17:22:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id E81351872B for ; Mon, 17 Feb 2014 17:22:35 +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: <1392657708.5af9d454a5da4eac702857ea392e6725e6cdd013.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/setupscript/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/setupscript/runtime.py X-VCS-Directories: roverlay/setupscript/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 5af9d454a5da4eac702857ea392e6725e6cdd013 X-VCS-Branch: master Date: Mon, 17 Feb 2014 17:22:35 +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: 1be783ba-104f-4986-8680-85553effda30 X-Archives-Hash: 9feb40b2568bee2b63d2085018a024ad commit: 5af9d454a5da4eac702857ea392e6725e6cdd013 Author: André Erdmann mailerd de> AuthorDate: Mon Feb 17 17:21:48 2014 +0000 Commit: André Erdmann mailerd de> CommitDate: Mon Feb 17 17:21:48 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=5af9d454 roverlay-setup, init: fix config file location (#2) + handle standalone versions of roverlay --- roverlay/setupscript/runtime.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/roverlay/setupscript/runtime.py b/roverlay/setupscript/runtime.py index 5aab1d8..0f4294d 100644 --- a/roverlay/setupscript/runtime.py +++ b/roverlay/setupscript/runtime.py @@ -406,10 +406,11 @@ class SetupEnvironment ( roverlay.runtime.IndependentRuntimeEnvironment ): # --- end of get_user_config_root (...) --- def get_config_file_path ( self ): - return ( - self._get_config_roots()[1] - + os.sep + self.access_constant ( 'config_file_name' ) - ) + cname = self.access_constant ( 'config_file_name' ) + if self.is_installed(): + return self._get_config_roots()[1] + os.sep + cname + else: + return self.prjroot + os.sep + cname # --- end of get_config_file_path (...) --- def create_new_target_config ( self ):