bitbake: toaster: use current directory if BUILDDIR is not set
If BUILDDIR environment variable is not set signal_runbuilds function throws TypeError as os.getenv('BUILDDIR') returns None: ERROR: unsupported operand type(s) for +=: 'NoneType' and 'str' Traceback (most recent call last): File "bitbake/lib/bb/ui/toasterui.py", line 391, in main buildinfohelper.update_build_information(event, errors, warnings, taskfailures) File "bitbake/lib/bb/ui/buildinfohelper.py", line 1184, in update_build_information self.internal_state['build'], errors, warnings, taskfailures) File "bitbake/lib/bb/ui/buildinfohelper.py", line 238, in update_build_stats_and_outcome signal_runbuilds() File "bitbake/lib/toaster/orm/models.py", line 1746, in signal_runbuilds '.runbuilds.pid')) as pidf: File "/usr/lib64/python3.4/posixpath.py", line 82, in join path += b TypeError: unsupported operand type(s) for +=: 'NoneType' and 'str' Used os.getenv('BUILDIR', '.') to make it always return meaningful directory path. Current directory '.' will be used if BUILDDIR is not set. (Bitbake rev: da631152a0db3f432709a05ff15a268d784ca3ab) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
637c93edfa
commit
98ac0b0a5b
|
@ -1742,7 +1742,7 @@ def invalidate_cache(**kwargs):
|
||||||
def signal_runbuilds():
|
def signal_runbuilds():
|
||||||
"""Send SIGUSR1 to runbuilds process"""
|
"""Send SIGUSR1 to runbuilds process"""
|
||||||
try:
|
try:
|
||||||
with open(os.path.join(os.getenv('BUILDDIR'),
|
with open(os.path.join(os.getenv('BUILDDIR', '.'),
|
||||||
'.runbuilds.pid')) as pidf:
|
'.runbuilds.pid')) as pidf:
|
||||||
os.kill(int(pidf.read()), SIGUSR1)
|
os.kill(int(pidf.read()), SIGUSR1)
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
|
|
Loading…
Reference in New Issue