diff options
Diffstat (limited to 'meta/classes/prserv.bbclass')
-rw-r--r-- | meta/classes/prserv.bbclass | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/meta/classes/prserv.bbclass b/meta/classes/prserv.bbclass index 18b8589a7b..0825306f91 100644 --- a/meta/classes/prserv.bbclass +++ b/meta/classes/prserv.bbclass | |||
@@ -1,29 +1,21 @@ | |||
1 | def prserv_make_conn(d): | ||
2 | import prserv.serv | ||
3 | host=d.getVar("PRSERV_HOST",True) | ||
4 | port=d.getVar("PRSERV_PORT",True) | ||
5 | try: | ||
6 | conn=None | ||
7 | conn=prserv.serv.PRServerConnection(host,int(port)) | ||
8 | d.setVar("__PRSERV_CONN",conn) | ||
9 | except Exception, exc: | ||
10 | bb.fatal("Connecting to PR service %s:%s failed: %s" % (host, port, str(exc))) | ||
11 | |||
12 | return conn | ||
13 | |||
14 | def prserv_get_pr_auto(d): | 1 | def prserv_get_pr_auto(d): |
15 | if d.getVar('USE_PR_SERV', True) != "0": | 2 | import oe.prservice |
3 | if d.getVar('USE_PR_SERV', True) != "1": | ||
16 | bb.warn("Not using network based PR service") | 4 | bb.warn("Not using network based PR service") |
17 | return None | 5 | return None |
18 | 6 | ||
19 | conn=d.getVar("__PRSERV_CONN", True) | 7 | version = d.getVar("PRAUTOINX", True) |
20 | if conn is None: | 8 | pkgarch = d.getVar("PACKAGE_ARCH", True) |
21 | conn=prserv_make_conn(d) | 9 | checksum = d.getVar("BB_TASKHASH", True) |
10 | |||
11 | if d.getVar('PRSERV_LOCKDOWN', True): | ||
12 | auto_rev = d.getVar('PRAUTO_' + version + '_' + pkgarch, True) or d.getVar('PRAUTO_' + version, True) or None | ||
13 | else: | ||
14 | conn = d.getVar("__PRSERV_CONN", True) | ||
22 | if conn is None: | 15 | if conn is None: |
23 | return None | 16 | conn = oe.prservice.prserv_make_conn(d) |
17 | if conn is None: | ||
18 | return None | ||
19 | auto_rev = conn.getPR(version, pkgarch, checksum) | ||
24 | 20 | ||
25 | version=d.getVar("PF", True) | ||
26 | checksum=d.getVar("BB_TASKHASH", True) | ||
27 | auto_rev=conn.getPR(version,checksum) | ||
28 | bb.debug(1,"prserv_get_pr_auto: version: %s checksum: %s result %d" % (version, checksum, auto_rev)) | ||
29 | return auto_rev | 21 | return auto_rev |