diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-08-02 10:23:07 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-06 15:29:46 +0100 |
| commit | 507dba64e0d997ec187b218a7a8b5f883908d158 (patch) | |
| tree | b626a75189ff861ff23b8807448975a5b4e5c6f6 /meta | |
| parent | 81485a47d53e121ac3d8f27e225f7fa8fb7c3bf7 (diff) | |
| download | poky-507dba64e0d997ec187b218a7a8b5f883908d158.tar.gz | |
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oe/buildhistory_analysis.py | 20 |
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 | ||
| 264 | def 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 | |||
| 282 | def compare_pkg_lists(astr, bstr): | 264 | def 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: |
