diff options
author | Frazer Clews <frazer.clews@codethink.co.uk> | 2020-01-16 17:11:19 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-19 13:31:05 +0000 |
commit | fa5524890e86d353ee7d2194ccdd6c84e9bd2d31 (patch) | |
tree | f3d46ddbd5dd2b772a727b04303bb97b8ae43b9b /bitbake/lib/bb/providers.py | |
parent | 0ac5174c7d39a3e49893df0d517d47bec1935555 (diff) | |
download | poky-fa5524890e86d353ee7d2194ccdd6c84e9bd2d31.tar.gz |
bitbake: lib: amend code to use proper singleton comparisons where possible
amend the code to handle singleton comparisons properly so it only checks
if they only refer to the same object or not, and not bother
comparing the values.
(Bitbake rev: b809a6812aa15a8a9af97bc382cc4b19571e6bfc)
Signed-off-by: Frazer Clews <frazer.clews@codethink.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/providers.py')
-rw-r--r-- | bitbake/lib/bb/providers.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py index f80963cb40..81459c36d5 100644 --- a/bitbake/lib/bb/providers.py +++ b/bitbake/lib/bb/providers.py | |||
@@ -92,11 +92,11 @@ def preferredVersionMatch(pe, pv, pr, preferred_e, preferred_v, preferred_r): | |||
92 | Check if the version pe,pv,pr is the preferred one. | 92 | Check if the version pe,pv,pr is the preferred one. |
93 | If there is preferred version defined and ends with '%', then pv has to start with that version after removing the '%' | 93 | If there is preferred version defined and ends with '%', then pv has to start with that version after removing the '%' |
94 | """ | 94 | """ |
95 | if (pr == preferred_r or preferred_r == None): | 95 | if pr == preferred_r or preferred_r is None: |
96 | if (pe == preferred_e or preferred_e == None): | 96 | if pe == preferred_e or preferred_e is None: |
97 | if preferred_v == pv: | 97 | if preferred_v == pv: |
98 | return True | 98 | return True |
99 | if preferred_v != None and preferred_v.endswith('%') and pv.startswith(preferred_v[:len(preferred_v)-1]): | 99 | if preferred_v is not None and preferred_v.endswith('%') and pv.startswith(preferred_v[:len(preferred_v)-1]): |
100 | return True | 100 | return True |
101 | return False | 101 | return False |
102 | 102 | ||