diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-01-18 11:18:09 +1300 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-01-18 11:20:23 +1300 |
| commit | 19a559cfa665b1add51fad41b7db88237fa82a09 (patch) | |
| tree | c04253ed7ef6381664f9977bf77b02ac6e70205e /layerindex/update_layer.py | |
| parent | fd5111a2ac1a6f79fef3f1bf32b6a3a751b8d79b (diff) | |
| download | openembedded-core-contrib-19a559cfa665b1add51fad41b7db88237fa82a09.tar.gz | |
update_layer: fix tinfoil shutdown check to work for fido branch
The fido branch of OE-Core expects BitBake 1.26.x. Unfortunately that
version had a commit backported which introduced a non-working
tinfoil.shutdown() method, so we can't simply rely on its presence to
determine whether or not it should be called. Use a check on the BitBake
version number instead.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'layerindex/update_layer.py')
| -rw-r--r-- | layerindex/update_layer.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py index 66337cf069..705227b0d3 100644 --- a/layerindex/update_layer.py +++ b/layerindex/update_layer.py @@ -705,7 +705,7 @@ def main(): import traceback traceback.print_exc() finally: - if hasattr(tinfoil, 'shutdown'): + if LooseVersion(bb.__version__) > LooseVersion("1.27"): tinfoil.shutdown() shutil.rmtree(tempdir) |