| 1 |
commit: 30dd2c76ba89169931784493cf326dd691a4a7bc |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Wed Jun 6 19:43:22 2012 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Wed Jun 6 19:43:22 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=30dd2c76 |
| 7 |
|
| 8 |
roverlay/config.py: fix _add_entry(...) |
| 9 |
|
| 10 |
--- |
| 11 |
roverlay/config.py | 7 ++++--- |
| 12 |
1 files changed, 4 insertions(+), 3 deletions(-) |
| 13 |
|
| 14 |
diff --git a/roverlay/config.py b/roverlay/config.py |
| 15 |
index 424e69f..6753d4e 100644 |
| 16 |
--- a/roverlay/config.py |
| 17 |
+++ b/roverlay/config.py |
| 18 |
@@ -328,7 +328,7 @@ class ConfigTree: |
| 19 |
cref_level = 0 |
| 20 |
|
| 21 |
# check if cref is a link to another entry in CONFIG_ENTRY_MAP |
| 22 |
- while isinstance ( cref, str ): |
| 23 |
+ while isinstance ( cref, str ) and cref != '': |
| 24 |
if cref == original_cref and cref_level: |
| 25 |
self.logger.critical ( "CONFIG_ENTRY_MAP is invalid! circular cref detected." ) |
| 26 |
raise Exception ( "CONFIG_ENTRY_MAP is invalid!" ) |
| 27 |
@@ -415,12 +415,13 @@ class ConfigTree: |
| 28 |
# load file |
| 29 |
|
| 30 |
try: |
| 31 |
+ fh = open ( config_file, 'r' ) |
| 32 |
+ reader = shlex.shlex ( fh ) |
| 33 |
reader.wordchars += ' ./$()[]:+-@*~' |
| 34 |
- fh = open ( config_file, 'r' ) |
| 35 |
- reader = shlex.shlex ( fh ) |
| 36 |
reader.whitespace_split = False |
| 37 |
|
| 38 |
|
| 39 |
+ |
| 40 |
nextline = lambda : ( reader.get_token() for n in range (3) ) |
| 41 |
|
| 42 |
option, equal, value = nextline () |
Archives