sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: lib/bb/utils: fix several bugs in edit_metadata_file() 

* Fix unchanged assignments being dropped if other lines changed
* Fix not passing variable name from single-line assignments to the
  function
* Fix not trimming the trailing quote from values

(Bitbake rev: 0b0c82f49cf2de887967d305768cbd95314bb171)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2015-05-18 16:08:35 +01:00 committed by Richard Purdie
parent 0d9c45289a
commit ba0546bfaf
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bitbake/lib/bb/utils.py
View File

@ -974,6 +974,7 @@ def edit_metadata_file(meta_file, variables, func):
updated = False
varset_start = ''
varlines = []
newlines = []
in_var = None
full_value = ''
@ -1001,14 +1002,19 @@ def edit_metadata_file(meta_file, variables, func):
else:
newlines.append('%s "%s"\n' % (varset_start, newvalue))
return True
return False
else:
# Put the old lines back where they were
newlines.extend(varlines)
return False
with open(meta_file, 'r') as f:
for line in f:
if in_var:
value = line.rstrip()
varlines.append(line)
full_value += value[:-1]
if value.endswith('"') or value.endswith("'"):
full_value = full_value[:-1]
if handle_var_end():
updated = True
in_var = None
@ -1022,11 +1028,13 @@ def edit_metadata_file(meta_file, variables, func):
if value.endswith('\\'):
value = value[:-1]
full_value = value
varlines = [line]
in_var = varname
if value.endswith('"') or value.endswith("'"):
full_value = full_value[:-1]
if handle_var_end():
updated = True
else:
in_var = varname
in_var = None
matched = True
break
if not matched: