Patchwork [2/2] package.bbclass, prserv.bbclass: Compare USE_PR_SERV with "1" or "0"

login
register
mail settings
Submitter Khem Raj
Date May 28, 2011, 2:44 a.m.
Message ID <7c83be4418db5dc23614761dd34a2887c44828b4.1306550616.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/4945/
State New, archived
Headers show

Comments

Khem Raj - May 28, 2011, 2:44 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(-)
Koen Kooi - May 28, 2011, 7:50 a.m.
Op 28 mei 2011, om 04:44 heeft Khem Raj het volgende geschreven:

> 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>

Fixes the problem for me:

Tested-by: Koen Kooi <koen@dominion.thruhere.net>

> ---
> meta/classes/package.bbclass |    2 +-
> meta/classes/prserv.bbclass  |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> 
> 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
> 
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Martin Jansa - May 28, 2011, 8:08 a.m.
On Sat, May 28, 2011 at 09:50:09AM +0200, Koen Kooi wrote:
> 
> Op 28 mei 2011, om 04:44 heeft Khem Raj het volgende geschreven:
> 
> > 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>
> 
> Fixes the problem for me:
> 
> Tested-by: Koen Kooi <koen@dominion.thruhere.net>

For me too:
Tested-by: Martin Jansa <Martin.Jansa@gmail.com>

> > ---
> > meta/classes/package.bbclass |    2 +-
> > meta/classes/prserv.bbclass  |    2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > 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
> > 
> > -- 
> > 1.7.4.1
> > 
> > 
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

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