summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/lib/oe/buildhistory_analysis.py20
1 files changed, 1 insertions, 19 deletions
diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py
index 55bd7b769d..a1a04085c2 100644
--- a/meta/lib/oe/buildhistory_analysis.py
+++ b/meta/lib/oe/buildhistory_analysis.py
@@ -261,24 +261,6 @@ def compare_lists(alines, blines):
261 return filechanges 261 return filechanges
262 262
263 263
264def split_version(s):
265 """Split a version string into its constituent parts (PE, PV, PR)
266 FIXME: this is a duplicate of a new function in bitbake/lib/bb/utils -
267 we should switch to that once we can bump the minimum bitbake version
268 """
269 s = s.strip(" <>=")
270 e = 0
271 if s.count(':'):
272 e = int(s.split(":")[0])
273 s = s.split(":")[1]
274 r = ""
275 if s.count('-'):
276 r = s.rsplit("-", 1)[1]
277 s = s.rsplit("-", 1)[0]
278 v = s
279 return (e, v, r)
280
281
282def compare_pkg_lists(astr, bstr): 264def compare_pkg_lists(astr, bstr):
283 depvera = bb.utils.explode_dep_versions(astr) 265 depvera = bb.utils.explode_dep_versions(astr)
284 depverb = bb.utils.explode_dep_versions(bstr) 266 depverb = bb.utils.explode_dep_versions(bstr)
@@ -290,7 +272,7 @@ def compare_pkg_lists(astr, bstr):
290 dva = depvera[k] 272 dva = depvera[k]
291 dvb = depverb[k] 273 dvb = depverb[k]
292 if dva and dvb and dva != dvb: 274 if dva and dvb and dva != dvb:
293 if bb.utils.vercmp(split_version(dva), split_version(dvb)) < 0: 275 if bb.utils.vercmp(bb.utils.split_version(dva), bb.utils.split_version(dvb)) < 0:
294 remove.append(k) 276 remove.append(k)
295 277
296 for k in remove: 278 for k in remove: