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 967AE1381F3 for ; Mon, 16 Sep 2013 13:43:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34912E0A62; Mon, 16 Sep 2013 13:43:28 +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 BD63BE09C1 for ; Mon, 16 Sep 2013 13:43:27 +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 9B74E33EA6A for ; Mon, 16 Sep 2013 13:43:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4BF94E530A for ; Mon, 16 Sep 2013 13:43:25 +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: <1379327348.d741cd6327b979d68dcdedba7d051f1faebc19d2.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: d741cd6327b979d68dcdedba7d051f1faebc19d2 X-VCS-Branch: master Date: Mon, 16 Sep 2013 13:43:25 +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: 2ecad877-d0bb-4bc4-aa06-295881336cbd X-Archives-Hash: 4ae88b337c8356c2837068590232ea17 commit: d741cd6327b979d68dcdedba7d051f1faebc19d2 Author: André Erdmann mailerd de> AuthorDate: Mon Sep 16 10:29:08 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Mon Sep 16 10:29:08 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=d741cd63 roverlay/core, locate_config_file(): prefer .local if not installed: (try to) use R-overlay.conf.local as default config file and fall back to R-overlay.conf --- roverlay/core.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roverlay/core.py b/roverlay/core.py index 2872c48..1a5ac5c 100644 --- a/roverlay/core.py +++ b/roverlay/core.py @@ -148,6 +148,9 @@ def locate_config_file ( if os.path.isfile ( cfg ): return cfg + elif os.path.exists ( CONFIG_FILE_NAME + '.local' ): + return CONFIG_FILE_NAME + '.local' + elif os.path.exists ( CONFIG_FILE_NAME ): return CONFIG_FILE_NAME