diff options
Diffstat (limited to 'bitbake/lib/prserv/serv.py')
-rw-r--r-- | bitbake/lib/prserv/serv.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py index 5567c6f574..316512d7ac 100644 --- a/bitbake/lib/prserv/serv.py +++ b/bitbake/lib/prserv/serv.py | |||
@@ -266,17 +266,20 @@ def is_local_special(host, port): | |||
266 | else: | 266 | else: |
267 | return False | 267 | return False |
268 | 268 | ||
269 | class PRServiceConfigError(Exception): | ||
270 | pass | ||
271 | |||
269 | def auto_start(d): | 272 | def auto_start(d): |
270 | global singleton | 273 | global singleton |
271 | if (not d.getVar('PRSERV_HOST', True)) or (not d.getVar('PRSERV_PORT', True)): | 274 | if (not d.getVar('PRSERV_HOST', True)) or (not d.getVar('PRSERV_PORT', True)): |
272 | return True | 275 | return |
273 | 276 | ||
274 | if is_local_special(d.getVar('PRSERV_HOST', True), int(d.getVar('PRSERV_PORT', True))) and not singleton: | 277 | if is_local_special(d.getVar('PRSERV_HOST', True), int(d.getVar('PRSERV_PORT', True))) and not singleton: |
275 | import bb.utils | 278 | import bb.utils |
276 | cachedir = (d.getVar("PERSISTENT_DIR", True) or d.getVar("CACHE", True)) | 279 | cachedir = (d.getVar("PERSISTENT_DIR", True) or d.getVar("CACHE", True)) |
277 | if not cachedir: | 280 | if not cachedir: |
278 | logger.critical("Please set the 'PERSISTENT_DIR' or 'CACHE' variable") | 281 | logger.critical("Please set the 'PERSISTENT_DIR' or 'CACHE' variable") |
279 | sys.exit(1) | 282 | raise PRServiceConfigError |
280 | bb.utils.mkdirhier(cachedir) | 283 | bb.utils.mkdirhier(cachedir) |
281 | dbfile = os.path.join(cachedir, "prserv.sqlite3") | 284 | dbfile = os.path.join(cachedir, "prserv.sqlite3") |
282 | logfile = os.path.join(cachedir, "prserv.log") | 285 | logfile = os.path.join(cachedir, "prserv.log") |
@@ -292,7 +295,7 @@ def auto_start(d): | |||
292 | return PRServerConnection(host,port).ping() | 295 | return PRServerConnection(host,port).ping() |
293 | except Exception: | 296 | except Exception: |
294 | logger.critical("PRservice %s:%d not available" % (host, port)) | 297 | logger.critical("PRservice %s:%d not available" % (host, port)) |
295 | return False | 298 | raise PRServiceConfigError |
296 | 299 | ||
297 | def auto_shutdown(d=None): | 300 | def auto_shutdown(d=None): |
298 | global singleton | 301 | global singleton |