buildhistory_analysis: tidy up duplicate split_version function
This function is now provided by bb.utils and since we have now bumped the minimum bitbake version, we can switch to that one instead. (From OE-Core rev: 67a4d15f0a8032190e92026677150162a492a053) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
81485a47d5
commit
507dba64e0
|
@ -261,24 +261,6 @@ def compare_lists(alines, blines):
|
||||||
return filechanges
|
return filechanges
|
||||||
|
|
||||||
|
|
||||||
def split_version(s):
|
|
||||||
"""Split a version string into its constituent parts (PE, PV, PR)
|
|
||||||
FIXME: this is a duplicate of a new function in bitbake/lib/bb/utils -
|
|
||||||
we should switch to that once we can bump the minimum bitbake version
|
|
||||||
"""
|
|
||||||
s = s.strip(" <>=")
|
|
||||||
e = 0
|
|
||||||
if s.count(':'):
|
|
||||||
e = int(s.split(":")[0])
|
|
||||||
s = s.split(":")[1]
|
|
||||||
r = ""
|
|
||||||
if s.count('-'):
|
|
||||||
r = s.rsplit("-", 1)[1]
|
|
||||||
s = s.rsplit("-", 1)[0]
|
|
||||||
v = s
|
|
||||||
return (e, v, r)
|
|
||||||
|
|
||||||
|
|
||||||
def compare_pkg_lists(astr, bstr):
|
def compare_pkg_lists(astr, bstr):
|
||||||
depvera = bb.utils.explode_dep_versions(astr)
|
depvera = bb.utils.explode_dep_versions(astr)
|
||||||
depverb = bb.utils.explode_dep_versions(bstr)
|
depverb = bb.utils.explode_dep_versions(bstr)
|
||||||
|
@ -290,7 +272,7 @@ def compare_pkg_lists(astr, bstr):
|
||||||
dva = depvera[k]
|
dva = depvera[k]
|
||||||
dvb = depverb[k]
|
dvb = depverb[k]
|
||||||
if dva and dvb and dva != dvb:
|
if dva and dvb and dva != dvb:
|
||||||
if bb.utils.vercmp(split_version(dva), split_version(dvb)) < 0:
|
if bb.utils.vercmp(bb.utils.split_version(dva), bb.utils.split_version(dvb)) < 0:
|
||||||
remove.append(k)
|
remove.append(k)
|
||||||
|
|
||||||
for k in remove:
|
for k in remove:
|
||||||
|
|
Loading…
Reference in New Issue