diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-10-31 16:40:37 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-04 12:50:29 +0000 |
| commit | da631152a0db3f432709a05ff15a268d784ca3ab (patch) | |
| tree | e8d9309c15b1635336d8f350320c703bc0e15566 /lib/toaster/orm | |
| parent | e23b574fe52f416184ee43838b8ab28b5b8eb71d (diff) | |
| download | bitbake-da631152a0db3f432709a05ff15a268d784ca3ab.tar.gz | |
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.
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>
Diffstat (limited to 'lib/toaster/orm')
| -rw-r--r-- | lib/toaster/orm/models.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py index 9a4db1e85..4f8510c4e 100644 --- a/lib/toaster/orm/models.py +++ b/lib/toaster/orm/models.py @@ -1742,7 +1742,7 @@ def invalidate_cache(**kwargs): def signal_runbuilds(): """Send SIGUSR1 to runbuilds process""" try: - with open(os.path.join(os.getenv('BUILDDIR'), + with open(os.path.join(os.getenv('BUILDDIR', '.'), '.runbuilds.pid')) as pidf: os.kill(int(pidf.read()), SIGUSR1) except FileNotFoundError: |