diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-11-20 17:11:15 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-07 17:01:21 +0000 |
commit | 0debb11883379c746f91eb8a5262f22a669fd16b (patch) | |
tree | 866edadf33bc74b42869d1535f079b581d727a08 /bitbake/lib/bb/utils.py | |
parent | 9d19dd9bd709dca655b1eac13deaa49e2b54cd88 (diff) | |
download | poky-0debb11883379c746f91eb8a5262f22a669fd16b.tar.gz |
bitbake: lib/bb/utils: fix error in edit_metadata() when deleting first line
If you tried to delete the variable on the first line passed to
edit_metadata() this failed because the logic for trimming extra blank
lines didn't expect the list to be empty at that point - fix that bad
assumption.
(Bitbake rev: 8bce6fefdc5c046b916588962a2b429c0f648133)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/utils.py')
-rw-r--r-- | bitbake/lib/bb/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 7f82687ae4..9b28952231 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py | |||
@@ -1177,7 +1177,7 @@ def edit_metadata(meta_lines, variables, varfunc, match_overrides=False): | |||
1177 | if not skip: | 1177 | if not skip: |
1178 | if checkspc: | 1178 | if checkspc: |
1179 | checkspc = False | 1179 | checkspc = False |
1180 | if newlines[-1] == '\n' and line == '\n': | 1180 | if newlines and newlines[-1] == '\n' and line == '\n': |
1181 | # Squash blank line if there are two consecutive blanks after a removal | 1181 | # Squash blank line if there are two consecutive blanks after a removal |
1182 | continue | 1182 | continue |
1183 | newlines.append(line) | 1183 | newlines.append(line) |