summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-03 13:29:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-03 13:33:12 +0100
commit117b47553970fc5307374cbf500744b7c302efb4 (patch)
tree77dc6b53dea5e17c11d02e1258f698da5a27fdb5
parentd6d991c08f66cf9ab27c53075109212ea9129380 (diff)
downloadbitbake-117b47553970fc5307374cbf500744b7c302efb4.tar.gz
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] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/providers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/providers.py b/lib/bb/providers.py
index 24cb217ed..fcee6dc4f 100644
--- a/lib/bb/providers.py
+++ b/lib/bb/providers.py
@@ -130,7 +130,7 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None):
m = re.match('(\d+:)*(.*)(_.*)*', preferred_v)
if m:
if m.group(1):
- preferred_e = int(m.group(1)[:-1])
+ preferred_e = m.group(1)[:-1]
else:
preferred_e = None
preferred_v = m.group(2)