diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-05-22 16:42:22 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-23 08:18:49 +0100 |
| commit | cd92e5dce5f5d61ecb7838bf964a7812e905509a (patch) | |
| tree | 0df8d7bc95aa42a7eef58a85b726c8177fb92a64 | |
| parent | 8dcd83e5edb1cf3307b610d3bb8d54733ea7356d (diff) | |
| download | bitbake-cd92e5dce5f5d61ecb7838bf964a7812e905509a.tar.gz | |
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 master rev: 0b0c82f49cf2de887967d305768cbd95314bb171)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/utils.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/bb/utils.py b/lib/bb/utils.py index 1681efd7e..0db7e5665 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -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: |