| 1 |
commit: 9be2a6aaaac4f0377e3895787aef47ad0d8a93f3 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Wed May 7 01:17:54 2014 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Wed May 7 01:17:54 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=9be2a6aa |
| 7 |
|
| 8 |
not-installed: search for config file in PRJROOT |
| 9 |
|
| 10 |
This allows to run |
| 11 |
roverlay.load_locate_config_file(False,load_main_only=True) |
| 12 |
from "any" location if ROVERLAY_PRJROOT and PYTHONPATH are set properly. |
| 13 |
|
| 14 |
--- |
| 15 |
roverlay/core.py | 10 ++++++---- |
| 16 |
1 file changed, 6 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/roverlay/core.py b/roverlay/core.py |
| 19 |
index d462f0f..2f4215b 100644 |
| 20 |
--- a/roverlay/core.py |
| 21 |
+++ b/roverlay/core.py |
| 22 |
@@ -155,11 +155,13 @@ def locate_config_file ( |
| 23 |
if os.path.isfile ( cfg ): |
| 24 |
return cfg |
| 25 |
|
| 26 |
- elif os.path.exists ( CONFIG_FILE_NAME + '.local' ): |
| 27 |
- return CONFIG_FILE_NAME + '.local' |
| 28 |
+ else: |
| 29 |
+ config_dir = os.environ.get ( 'ROVERLAY_PRJROOT', os.getcwd() ) |
| 30 |
|
| 31 |
- elif os.path.exists ( CONFIG_FILE_NAME ): |
| 32 |
- return CONFIG_FILE_NAME |
| 33 |
+ for fname in ( CONFIG_FILE_NAME + '.local', CONFIG_FILE_NAME ): |
| 34 |
+ fpath = config_dir + os.sep + fname |
| 35 |
+ if os.path.exists ( fpath ): |
| 36 |
+ return fpath |
| 37 |
|
| 38 |
return None |
| 39 |
# --- end of locate_config_file (...) --- |
Archives