| 1 |
commit: 3608ce9e8abe2412f2cf032b1e22c1a3be8aee2a |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Mon Jun 25 18:05:17 2012 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Mon Jun 25 18:05:17 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=3608ce9e |
| 7 |
|
| 8 |
fix _tree_to_str() in ConfigTree |
| 9 |
|
| 10 |
modified: roverlay/config/tree.py |
| 11 |
|
| 12 |
--- |
| 13 |
roverlay/config/tree.py | 16 ++++++++++------ |
| 14 |
1 files changed, 10 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/roverlay/config/tree.py b/roverlay/config/tree.py |
| 17 |
index 707aa8a..adcdcde 100644 |
| 18 |
--- a/roverlay/config/tree.py |
| 19 |
+++ b/roverlay/config/tree.py |
| 20 |
@@ -189,13 +189,17 @@ class ConfigTree ( object ): |
| 21 |
var_indent = indent + '* ' |
| 22 |
if root is None: |
| 23 |
return "%s%s is unset\n" % ( var_indent, name ) |
| 24 |
- elif len ( root ) == 0: |
| 25 |
- return "%s%s is empty\n" % ( var_indent, name ) |
| 26 |
elif isinstance ( root, dict ): |
| 27 |
- extra = ''.join ( [ |
| 28 |
- self._tree_to_str ( n, r, level+1 ) for r, n in root.items() |
| 29 |
- ] ) |
| 30 |
- return "%s%s {\n%s%s}\n" % ( indent, name, extra, indent ) |
| 31 |
+ if len ( root ) == 0: |
| 32 |
+ return "%s%s is empty\n" % ( var_indent, name ) |
| 33 |
+ else: |
| 34 |
+ extra = ''.join ( [ |
| 35 |
+ self._tree_to_str ( n, r, level+1 ) for r, n in root.items() |
| 36 |
+ ] ) |
| 37 |
+ return "%s%s {\n%s%s}\n" % ( indent, name, extra, indent ) |
| 38 |
+ elif level == 1: |
| 39 |
+ # non-nested config entry |
| 40 |
+ return "\n%s%s = '%s'\n\n" % ( var_indent, name, root ) |
| 41 |
else: |
| 42 |
return "%s%s = '%s'\n" % ( var_indent, name, root ) |
| 43 |
# --- end of _tree_to_str (...) --- |
Archives