diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-03 13:29:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-03 13:33:26 +0100 |
commit | 2f9328ff32cdbd67ba56a13a3a9a32820605a31f (patch) | |
tree | f7551c139b64e7e6c35664e7f9066ac0cb35b198 /bitbake/lib/bb/providers.py | |
parent | 423bb6b276d55df9cd8c5c5a1bd8a26433c028ee (diff) | |
download | poky-2f9328ff32cdbd67ba56a13a3a9a32820605a31f.tar.gz |
bitbake: providers.py: Fix PREFERRED_VERSION containing epochs
For some reason the code calls int() on the epoch component of any
PREFERRED_VERSION. Since this is compared against strings, the comparison
would always fail. This removes the stray cast and allows epochs
in preferred_version to work correctly.
[YOCTO #3187]
(Bitbake rev: 117b47553970fc5307374cbf500744b7c302efb4)
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py index 24cb217edf..fcee6dc4f7 100644 --- a/bitbake/lib/bb/providers.py +++ b/bitbake/lib/bb/providers.py | |||
@@ -130,7 +130,7 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None): | |||
130 | m = re.match('(\d+:)*(.*)(_.*)*', preferred_v) | 130 | m = re.match('(\d+:)*(.*)(_.*)*', preferred_v) |
131 | if m: | 131 | if m: |
132 | if m.group(1): | 132 | if m.group(1): |
133 | preferred_e = int(m.group(1)[:-1]) | 133 | preferred_e = m.group(1)[:-1] |
134 | else: | 134 | else: |
135 | preferred_e = None | 135 | preferred_e = None |
136 | preferred_v = m.group(2) | 136 | preferred_v = m.group(2) |