summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2018-10-04 09:19:24 +0100
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2018-10-04 10:04:21 +0100
commitc74bfbe502bf85fbd1dfd493101b77ffef275ebe (patch)
tree424f946d80951d21e2f58dccd1d3c3ba205f5cdc
parentb8421a9c86e4dc5f860516ef05163b99fd72809c (diff)
downloadbuildstream-c74bfbe502bf85fbd1dfd493101b77ffef275ebe.tar.gz
_site.py: Reduce complexity of bwrap version comparison
Instead of an if/else ladder which is quite complex, this patch uses the fact that Python supports by-component tuple comparison to simply compare two (major, minor, patch) tuples Signed-off-by: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
-rw-r--r--buildstream/_site.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/buildstream/_site.py b/buildstream/_site.py
index 63a49b893..30e1000d4 100644
--- a/buildstream/_site.py
+++ b/buildstream/_site.py
@@ -86,14 +86,4 @@ def check_bwrap_version(major, minor, patch):
_bwrap_major, _bwrap_minor, _bwrap_patch = map(int, version.split("."))
# Check whether the installed version meets the requirements
- if _bwrap_major > major:
- return True
- elif _bwrap_major < major:
- return False
- else:
- if _bwrap_minor > minor:
- return True
- elif _bwrap_minor < minor:
- return False
- else:
- return _bwrap_patch >= patch
+ return (_bwrap_major, _bwrap_minor, _bwrap_patch) >= (major, minor, patch)