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

login
register
mail settings
Submitter Khem Raj
Date May 28, 2011, 1:30 a.m.
Message ID <1306546251-8236-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/4941/
State New, archived
Headers show

Comments

Khem Raj - May 28, 2011, 1:30 a.m.
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

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/classes/package.bbclass |    2 +-
 meta/classes/prserv.bbclass  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index a1b9482..1e6a872 100644
--- 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 de46ff6..18b8589 100644
--- 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