* [PATCH 1/3] prserv: use only PRSERV_HOST
@ 2013-01-23 14:54 Constantin Musca
2013-01-25 13:47 ` [bitbake-devel] " Martin Jansa
0 siblings, 1 reply; 4+ messages in thread
From: Constantin Musca @ 2013-01-23 14:54 UTC (permalink / raw)
To: bitbake-devel; +Cc: Constantin Musca
- remove PRSERV_PORT variable
- use 'hostname:port' as PRSERV_HOST format
- use 'localhost:0' for enabling the local PRServer
[YOCTO #3744]
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
bitbake/lib/prserv/serv.py | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py
index 5567c6f..d8bdf31 100644
--- a/bitbake/lib/prserv/serv.py
+++ b/bitbake/lib/prserv/serv.py
@@ -268,10 +268,17 @@ def is_local_special(host, port):
def auto_start(d):
global singleton
- if (not d.getVar('PRSERV_HOST', True)) or (not d.getVar('PRSERV_PORT', True)):
+
+ host_params = filter(None, (d.getVar('PRSERV_HOST', True) or '').split(':'))
+ if not host_params:
+ return True
+
+ if len(host_params) != 2:
+ logger.critical('\n'.join(['PRSERV_HOST: incorrect format',
+ 'Usage: PRSERV_HOST = "<hostname>:<port>"']))
return True
- if is_local_special(d.getVar('PRSERV_HOST', True), int(d.getVar('PRSERV_PORT', True))) and not singleton:
+ if is_local_special(host_params[0], int(host_params[1])) and not singleton:
import bb.utils
cachedir = (d.getVar("PERSISTENT_DIR", True) or d.getVar("CACHE", True))
if not cachedir:
@@ -285,8 +292,8 @@ def auto_start(d):
if singleton:
host, port = singleton.getinfo()
else:
- host = d.getVar('PRSERV_HOST', True)
- port = int(d.getVar('PRSERV_PORT', True))
+ host = host_params[0]
+ port = int(host_params[1])
try:
return PRServerConnection(host,port).ping()
--
1.7.11.7
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] prserv: use only PRSERV_HOST
2013-01-23 14:54 [PATCH 1/3] prserv: use only PRSERV_HOST Constantin Musca
@ 2013-01-25 13:47 ` Martin Jansa
0 siblings, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2013-01-25 13:47 UTC (permalink / raw)
To: Constantin Musca; +Cc: bitbake-devel, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3231 bytes --]
On Wed, Jan 23, 2013 at 04:54:03PM +0200, Constantin Musca wrote:
> - remove PRSERV_PORT variable
> - use 'hostname:port' as PRSERV_HOST format
> - use 'localhost:0' for enabling the local PRServer
Please update
https://wiki.yoctoproject.org/wiki/index.php?title=PR_Service
This seems to break 'bitbake-prserv-tool migrate_localcount'
ERROR: Execution of event handler 'primport_handler' failed################################################################################## | ETA: 00:00:00
Traceback (most recent call last):
File "primport_handler(e)", line 9, in primport_handler(e=<bb.event.ParseCompleted object at 0xce963d0>)
File "/OE/shr-core/openembedded-core/meta/lib/oe/prservice.py", line 43, in prserv_import_db(d=<bb.data_smart.DataSmart object at 0x1aff710>, filter_version=None, filter_pkgarch=None, filter_checksum=None):
if conn is None:
> conn = prserv_make_conn(d)
if conn is None:
File "/OE/shr-core/openembedded-core/meta/lib/oe/prservice.py", line 13, in prserv_make_conn(d=<bb.data_smart.DataSmart object at 0x1aff710>, check=False):
except Exception, exc:
> bb.fatal("Connecting to PR service %s:%s failed: %s" % (host, port, str(exc)))
NameError: global name 'host' is not defined
Cheers,
>
> [YOCTO #3744]
>
> Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
> ---
> bitbake/lib/prserv/serv.py | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py
> index 5567c6f..d8bdf31 100644
> --- a/bitbake/lib/prserv/serv.py
> +++ b/bitbake/lib/prserv/serv.py
> @@ -268,10 +268,17 @@ def is_local_special(host, port):
>
> def auto_start(d):
> global singleton
> - if (not d.getVar('PRSERV_HOST', True)) or (not d.getVar('PRSERV_PORT', True)):
> +
> + host_params = filter(None, (d.getVar('PRSERV_HOST', True) or '').split(':'))
> + if not host_params:
> + return True
> +
> + if len(host_params) != 2:
> + logger.critical('\n'.join(['PRSERV_HOST: incorrect format',
> + 'Usage: PRSERV_HOST = "<hostname>:<port>"']))
> return True
>
> - if is_local_special(d.getVar('PRSERV_HOST', True), int(d.getVar('PRSERV_PORT', True))) and not singleton:
> + if is_local_special(host_params[0], int(host_params[1])) and not singleton:
> import bb.utils
> cachedir = (d.getVar("PERSISTENT_DIR", True) or d.getVar("CACHE", True))
> if not cachedir:
> @@ -285,8 +292,8 @@ def auto_start(d):
> if singleton:
> host, port = singleton.getinfo()
> else:
> - host = d.getVar('PRSERV_HOST', True)
> - port = int(d.getVar('PRSERV_PORT', True))
> + host = host_params[0]
> + port = int(host_params[1])
>
> try:
> return PRServerConnection(host,port).ping()
> --
> 1.7.11.7
>
>
> _______________________________________________
> bitbake-devel mailing list
> bitbake-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/bitbake-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [bitbake-devel] [PATCH 1/3] prserv: use only PRSERV_HOST
@ 2013-01-25 13:47 ` Martin Jansa
0 siblings, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2013-01-25 13:47 UTC (permalink / raw)
To: Constantin Musca; +Cc: bitbake-devel, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3231 bytes --]
On Wed, Jan 23, 2013 at 04:54:03PM +0200, Constantin Musca wrote:
> - remove PRSERV_PORT variable
> - use 'hostname:port' as PRSERV_HOST format
> - use 'localhost:0' for enabling the local PRServer
Please update
https://wiki.yoctoproject.org/wiki/index.php?title=PR_Service
This seems to break 'bitbake-prserv-tool migrate_localcount'
ERROR: Execution of event handler 'primport_handler' failed################################################################################## | ETA: 00:00:00
Traceback (most recent call last):
File "primport_handler(e)", line 9, in primport_handler(e=<bb.event.ParseCompleted object at 0xce963d0>)
File "/OE/shr-core/openembedded-core/meta/lib/oe/prservice.py", line 43, in prserv_import_db(d=<bb.data_smart.DataSmart object at 0x1aff710>, filter_version=None, filter_pkgarch=None, filter_checksum=None):
if conn is None:
> conn = prserv_make_conn(d)
if conn is None:
File "/OE/shr-core/openembedded-core/meta/lib/oe/prservice.py", line 13, in prserv_make_conn(d=<bb.data_smart.DataSmart object at 0x1aff710>, check=False):
except Exception, exc:
> bb.fatal("Connecting to PR service %s:%s failed: %s" % (host, port, str(exc)))
NameError: global name 'host' is not defined
Cheers,
>
> [YOCTO #3744]
>
> Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
> ---
> bitbake/lib/prserv/serv.py | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py
> index 5567c6f..d8bdf31 100644
> --- a/bitbake/lib/prserv/serv.py
> +++ b/bitbake/lib/prserv/serv.py
> @@ -268,10 +268,17 @@ def is_local_special(host, port):
>
> def auto_start(d):
> global singleton
> - if (not d.getVar('PRSERV_HOST', True)) or (not d.getVar('PRSERV_PORT', True)):
> +
> + host_params = filter(None, (d.getVar('PRSERV_HOST', True) or '').split(':'))
> + if not host_params:
> + return True
> +
> + if len(host_params) != 2:
> + logger.critical('\n'.join(['PRSERV_HOST: incorrect format',
> + 'Usage: PRSERV_HOST = "<hostname>:<port>"']))
> return True
>
> - if is_local_special(d.getVar('PRSERV_HOST', True), int(d.getVar('PRSERV_PORT', True))) and not singleton:
> + if is_local_special(host_params[0], int(host_params[1])) and not singleton:
> import bb.utils
> cachedir = (d.getVar("PERSISTENT_DIR", True) or d.getVar("CACHE", True))
> if not cachedir:
> @@ -285,8 +292,8 @@ def auto_start(d):
> if singleton:
> host, port = singleton.getinfo()
> else:
> - host = d.getVar('PRSERV_HOST', True)
> - port = int(d.getVar('PRSERV_PORT', True))
> + host = host_params[0]
> + port = int(host_params[1])
>
> try:
> return PRServerConnection(host,port).ping()
> --
> 1.7.11.7
>
>
> _______________________________________________
> bitbake-devel mailing list
> bitbake-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/bitbake-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] prservice.py: fix NameError: global name 'host' is not defined
2013-01-25 13:47 ` [bitbake-devel] " Martin Jansa
(?)
@ 2013-01-25 14:00 ` Martin Jansa
-1 siblings, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2013-01-25 14:00 UTC (permalink / raw)
To: openembedded-core
* http://git.openembedded.org/openembedded-core/commit/?id=e00f49de8b1f79c3e07b887d257bd75a46052fa0
removed host and port variables
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/lib/oe/prservice.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oe/prservice.py b/meta/lib/oe/prservice.py
index 57fb39a..27883a7 100644
--- a/meta/lib/oe/prservice.py
+++ b/meta/lib/oe/prservice.py
@@ -10,7 +10,7 @@ def prserv_make_conn(d, check = False):
raise Exception('service not available')
d.setVar("__PRSERV_CONN",conn)
except Exception, exc:
- bb.fatal("Connecting to PR service %s:%s failed: %s" % (host, port, str(exc)))
+ bb.fatal("Connecting to PR service %s:%s failed: %s" % (host_params[0], host_params[1], str(exc)))
return conn
--
1.8.1.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-01-25 14:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-23 14:54 [PATCH 1/3] prserv: use only PRSERV_HOST Constantin Musca
2013-01-25 13:47 ` Martin Jansa
2013-01-25 13:47 ` [bitbake-devel] " Martin Jansa
2013-01-25 14:00 ` [PATCH] prservice.py: fix NameError: global name 'host' is not defined Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.