From 10899dcec161f1dfa924f9c3b51a1d4115b3e013 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 3 Oct 2012 13:29:59 +0100 Subject: [PATCH] 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 --- bitbake/lib/bb/providers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py index 24cb217..fcee6dc 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): 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) -- 2.7.4