diff options
| author | Brendan Le Foll <brendan.le.foll@intel.com> | 2014-11-12 11:42:39 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-12 17:04:50 +0000 |
| commit | edaeb8940813b620090a0797ad3b6a076897512d (patch) | |
| tree | f7d21b8e612f970dd58e9c35293efbb31b477b89 | |
| parent | c5d19aae55be158676eb0914bd5d0701f7d3fd3a (diff) | |
| download | poky-edaeb8940813b620090a0797ad3b6a076897512d.tar.gz | |
bitbake: cooker.py: fix loginfo op being set to an invalid value
loginfo "op" was being set to invalid values in saveConfigurationVar it was
working because set is a python global but append is not. This replaces both
the "op" with strings and removes the crash when calling appendConfigurationVar
(Bitbake rev: 2a8e847de85546d43600a561f9c63aa36bd69222)
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index c6c69c30ea..087f72fc56 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
| @@ -240,7 +240,7 @@ class BBCooker: | |||
| 240 | f.write(total) | 240 | f.write(total) |
| 241 | 241 | ||
| 242 | #add to history | 242 | #add to history |
| 243 | loginfo = {"op":append, "file":default_file, "line":total.count("\n")} | 243 | loginfo = {"op":"append", "file":default_file, "line":total.count("\n")} |
| 244 | self.data.appendVar(var, val, **loginfo) | 244 | self.data.appendVar(var, val, **loginfo) |
| 245 | 245 | ||
| 246 | def saveConfigurationVar(self, var, val, default_file, op): | 246 | def saveConfigurationVar(self, var, val, default_file, op): |
| @@ -309,7 +309,7 @@ class BBCooker: | |||
| 309 | f.write(total) | 309 | f.write(total) |
| 310 | 310 | ||
| 311 | #add to history | 311 | #add to history |
| 312 | loginfo = {"op":set, "file":default_file, "line":total.count("\n")} | 312 | loginfo = {"op":"set", "file":default_file, "line":total.count("\n")} |
| 313 | self.data.setVar(var, val, **loginfo) | 313 | self.data.setVar(var, val, **loginfo) |
| 314 | 314 | ||
| 315 | def removeConfigurationVar(self, var): | 315 | def removeConfigurationVar(self, var): |
