diff options
Diffstat (limited to 'bitbake/lib/bb/data_smart.py')
-rw-r--r-- | bitbake/lib/bb/data_smart.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 22dadec5de..7de90056d5 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
@@ -30,10 +30,12 @@ BitBake build tools. | |||
30 | 30 | ||
31 | import copy, re, sys | 31 | import copy, re, sys |
32 | from collections import MutableMapping | 32 | from collections import MutableMapping |
33 | import logging | ||
33 | import bb | 34 | import bb |
34 | from bb import utils | 35 | from bb import utils |
35 | from bb.COW import COWDictBase | 36 | from bb.COW import COWDictBase |
36 | 37 | ||
38 | logger = logging.getLogger("BitBake.Data") | ||
37 | 39 | ||
38 | __setvar_keyword__ = ["_append", "_prepend"] | 40 | __setvar_keyword__ = ["_append", "_prepend"] |
39 | __setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend)(_(?P<add>.*))?') | 41 | __setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend)(_(?P<add>.*))?') |
@@ -101,10 +103,8 @@ class DataSmart(MutableMapping): | |||
101 | s = __expand_python_regexp__.sub(varparse.python_sub, s) | 103 | s = __expand_python_regexp__.sub(varparse.python_sub, s) |
102 | if s == olds: | 104 | if s == olds: |
103 | break | 105 | break |
104 | except KeyboardInterrupt: | 106 | except Exception: |
105 | raise | 107 | logger.exception("Error evaluating '%s'", s) |
106 | except: | ||
107 | bb.msg.note(1, bb.msg.domain.Data, "%s:%s while evaluating:\n%s" % (sys.exc_info()[0], sys.exc_info()[1], s)) | ||
108 | raise | 108 | raise |
109 | 109 | ||
110 | varparse.value = s | 110 | varparse.value = s |
@@ -152,7 +152,7 @@ class DataSmart(MutableMapping): | |||
152 | try: | 152 | try: |
153 | self[name] = self[var] | 153 | self[name] = self[var] |
154 | except Exception: | 154 | except Exception: |
155 | bb.msg.note(1, bb.msg.domain.Data, "Untracked delVar") | 155 | logger.info("Untracked delVar") |
156 | 156 | ||
157 | # now on to the appends and prepends | 157 | # now on to the appends and prepends |
158 | for op in __setvar_keyword__: | 158 | for op in __setvar_keyword__: |