diff options
| author | Christopher Larson <kergoth@gmail.com> | 2012-04-26 23:34:58 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-03 15:48:02 +0100 |
| commit | df914695b5ec523f9ce414a3988a912921382fd5 (patch) | |
| tree | 34619ccc183cd65bd9263ac2e9ba66f96a3f2c69 | |
| parent | 5d540ca3142b24f3d181bb712b0905cfd1a7af4b (diff) | |
| download | poky-df914695b5ec523f9ce414a3988a912921382fd5.tar.gz | |
base.bbclass: use isinstance for base_eventhandler
(From OE-Core rev: 86556a2bfa23ba69fea2ade14599054b186150cd)
Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/base.bbclass | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 07ef9a2316..bb39b7b0b3 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
| @@ -248,12 +248,13 @@ def buildcfg_neededvars(d): | |||
| 248 | 248 | ||
| 249 | addhandler base_eventhandler | 249 | addhandler base_eventhandler |
| 250 | python base_eventhandler() { | 250 | python base_eventhandler() { |
| 251 | from bb.event import getName | 251 | if isinstance(e, bb.event.ConfigParsed): |
| 252 | |||
| 253 | name = getName(e) | ||
| 254 | |||
| 255 | if name.startswith("BuildStarted"): | ||
| 256 | e.data.setVar('BB_VERSION', bb.__version__) | 252 | e.data.setVar('BB_VERSION', bb.__version__) |
| 253 | generate_git_config(e) | ||
| 254 | pkgarch_mapping(e.data) | ||
| 255 | preferred_ml_updates(e.data) | ||
| 256 | |||
| 257 | if isinstance(e, bb.event.BuildStarted): | ||
| 257 | statuslines = [] | 258 | statuslines = [] |
| 258 | for func in oe.data.typed_value('BUILDCFG_FUNCS', e.data): | 259 | for func in oe.data.typed_value('BUILDCFG_FUNCS', e.data): |
| 259 | g = globals() | 260 | g = globals() |
| @@ -266,11 +267,6 @@ python base_eventhandler() { | |||
| 266 | 267 | ||
| 267 | statusheader = e.data.getVar('BUILDCFG_HEADER', True) | 268 | statusheader = e.data.getVar('BUILDCFG_HEADER', True) |
| 268 | bb.plain('\n%s\n%s\n' % (statusheader, '\n'.join(statuslines))) | 269 | bb.plain('\n%s\n%s\n' % (statusheader, '\n'.join(statuslines))) |
| 269 | |||
| 270 | if name == "ConfigParsed": | ||
| 271 | generate_git_config(e) | ||
| 272 | pkgarch_mapping(e.data) | ||
| 273 | preferred_ml_updates(e.data) | ||
| 274 | } | 270 | } |
| 275 | 271 | ||
| 276 | addtask configure after do_patch | 272 | addtask configure after do_patch |
