From 865d001de168915a5796e5c760f96bdd04cebd61 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Nov 2014 18:44:24 +0000 Subject: package/prserv: Merge two similar functions into one Having these two separate functions handling PR values seems pointless, and worse, there are impossible code branches mixed within them. Merge them into one function and tweak comments so at least you don't have to read both functions to figure out what is going on. This does restructure the conditionals to try and aid readability. Signed-off-by: Richard Purdie --- meta/classes/prserv.bbclass | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'meta/classes/prserv.bbclass') diff --git a/meta/classes/prserv.bbclass b/meta/classes/prserv.bbclass index b440d863ef..139597f9cb 100644 --- a/meta/classes/prserv.bbclass +++ b/meta/classes/prserv.bbclass @@ -1,33 +1,2 @@ -def prserv_get_pr_auto(d): - import oe.prservice - import re - pv = d.getVar("PV", True) - if not d.getVar('PRSERV_HOST', True): - if 'AUTOINC' in pv: - d.setVar("PKGV", pv.replace("AUTOINC", "0")) - bb.warn("Not using network based PR service") - return None - version = d.getVar("PRAUTOINX", True) - pkgarch = d.getVar("PACKAGE_ARCH", True) - checksum = d.getVar("BB_TASKHASH", True) - - conn = d.getVar("__PRSERV_CONN", True) - if conn is None: - conn = oe.prservice.prserv_make_conn(d) - if conn is None: - return None - - if "AUTOINC" in pv: - srcpv = bb.fetch2.get_srcrev(d) - base_ver = "AUTOINC-%s" % version[:version.find(srcpv)] - value = conn.getPR(base_ver, pkgarch, srcpv) - d.setVar("PKGV", pv.replace("AUTOINC", str(value))) - - if d.getVar('PRSERV_LOCKDOWN', True): - auto_rev = d.getVar('PRAUTO_' + version + '_' + pkgarch, True) or d.getVar('PRAUTO_' + version, True) or None - else: - auto_rev = conn.getPR(version, pkgarch, checksum) - - return auto_rev -- cgit 1.2.3-korg