package.bbclass,prserv.bbclass: Compare USE_PR_SERV with "1" or "0"

Value of USE_PR_SERV is either "1" or "0" looking at
settings in bitbake.conf
USE_PR_SERV = "${@[1,0][(bb.data.getVar('PRSERV_HOST',d,1) is None) or (bb.data.getVar('PRSERV_PORT',d,1) is None)]}"
So we compare the strings

(From OE-Core rev: 5f6179324ac3956ad87123005bfcab4e8f30e67b)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index a1b948276feb17e1c6c91f0337f22697459e1a9d..1e6a872553a7b5cffa5ae5419893bf00a5ab3b49 100644 (file)
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -330,7 +330,7 @@ def runtime_mapping_rename (varname, d):
 #
 
 python package_get_auto_pr() {
-       if d.getVar('USE_PR_SERV', True):
+       if d.getVar('USE_PR_SERV', True) != "0":
                auto_pr=prserv_get_pr_auto(d)
                if auto_pr is None:
                        bb.fatal("Can NOT get auto PR revision from remote PR service")

diff --git a/meta/classes/prserv.bbclass b/meta/classes/prserv.bbclass
index de46ff689781ad33bfc6d0bed25dbda89b94b14b..18b8589a7b94b687a0859f30116f59a0d7735c1f 100644 (file)
--- a/meta/classes/prserv.bbclass
+++ b/meta/classes/prserv.bbclass
@@ -12,7 +12,7 @@ def prserv_make_conn(d):
     return conn
 
 def prserv_get_pr_auto(d):
-    if not d.getVar('USE_PR_SERV', True):
+    if d.getVar('USE_PR_SERV', True) != "0":
         bb.warn("Not using network based PR service")
         return None