diff options
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 | ||