diff options
| author |   Phil Blundell <philb@gnu.org> | 2005-07-27 22:58:35 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2005-07-27 22:58:35 +0000 |
| commit | 1ec240df4182d23ec6c0e142dd84aa50a71cd06c (patch) | |
| tree | c507a20e4eeb49eb2683a833cf5cca1b2544188e | |
| parent | 5cb7569c4848235db23c073200682d70aa7fc722 (diff) | |
| download | bitbake-1ec240df4182d23ec6c0e142dd84aa50a71cd06c.tar.gz | |
add .= and =. operators, as requested by Holger
| -rw-r--r-- | lib/bb/parse/parse_py/ConfHandler.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/bb/parse/parse_py/ConfHandler.py b/lib/bb/parse/parse_py/ConfHandler.py index deea9a4e6..41ef96d55 100644 --- a/lib/bb/parse/parse_py/ConfHandler.py +++ b/lib/bb/parse/parse_py/ConfHandler.py @@ -26,7 +26,7 @@ from bb import debug, fatal from bb.parse import ParseError #__config_regexp__ = re.compile( r"(?P<exp>export\s*)?(?P<var>[a-zA-Z0-9\-_+.${}]+)\s*(?P<colon>:)?(?P<ques>\?)?=\s*(?P<apo>['\"]?)(?P<value>.*)(?P=apo)$") -__config_regexp__ = re.compile( r"(?P<exp>export\s*)?(?P<var>[a-zA-Z0-9\-_+.${}/]+)(\[(?P<flag>[a-zA-Z0-9\-_+.]+)\])?\s*((?P<colon>:=)|(?P<ques>\?=)|(?P<append>\+=)|(?P<prepend>=\+)|=)\s*(?P<apo>['\"]?)(?P<value>.*)(?P=apo)$") +__config_regexp__ = re.compile( r"(?P<exp>export\s*)?(?P<var>[a-zA-Z0-9\-_+.${}/]+)(\[(?P<flag>[a-zA-Z0-9\-_+.]+)\])?\s*((?P<colon>:=)|(?P<ques>\?=)|(?P<append>\+=)|(?P<prepend>=\+)|(?P<predot>=\.)|(?P<postdot>\.=)|=)\s*(?P<apo>['\"]?)(?P<value>.*)(?P=apo)$") __include_regexp__ = re.compile( r"include\s+(.+)" ) def init(data): @@ -171,6 +171,10 @@ def feeder(lineno, s, fn, data = bb.data.init()): val = "%s %s" % ((bb.data.getVar(key, data) or ""), groupd["value"]) elif "prepend" in groupd and groupd["prepend"] != None: val = "%s %s" % (groupd["value"], (bb.data.getVar(key, data) or "")) + elif "postdot" in groupd and groupd["postdot"] != None: + val = "%s%s" % ((bb.data.getVar(key, data) or ""), groupd["value"]) + elif "predot" in groupd and groupd["predot"] != None: + val = "%s%s" % (groupd["value"], (bb.data.getVar(key, data) or "")) else: val = groupd["value"] if 'flag' in groupd and groupd['flag'] != None: |