aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/prserv.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-05 18:44:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-08 11:07:59 +0000
commit865d001de168915a5796e5c760f96bdd04cebd61 (patch)
tree9be08bb6cce0438c9320e3a71afd4f1f29fce2a3 /meta/classes/prserv.bbclass
parent0c21d06dea96ca5f19ac2e3136c66da582036a11 (diff)
downloadopenembedded-core-contrib-865d001de168915a5796e5c760f96bdd04cebd61.tar.gz
openembedded-core-contrib-865d001de168915a5796e5c760f96bdd04cebd61.tar.bz2
openembedded-core-contrib-865d001de168915a5796e5c760f96bdd04cebd61.zip
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/prserv.bbclass')
-rw-r--r--meta/classes/prserv.bbclass31
1 files changed, 0 insertions, 31 deletions
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