diff options
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 673af8daec..6754f986bf 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -1812,8 +1812,8 @@ class CookerCollectFiles(object): | |||
1812 | bb.event.fire(CookerExit(), eventdata) | 1812 | bb.event.fire(CookerExit(), eventdata) |
1813 | 1813 | ||
1814 | # We need to track where we look so that we can know when the cache is invalid. There | 1814 | # We need to track where we look so that we can know when the cache is invalid. There |
1815 | # is no nice way to do this, this is horrid. We intercept the os.listdir() | 1815 | # is no nice way to do this, this is horrid. We intercept the os.listdir() and os.scandir() |
1816 | # (or os.scandir() for python 3.6+) calls while we run glob(). | 1816 | # calls while we run glob(). |
1817 | origlistdir = os.listdir | 1817 | origlistdir = os.listdir |
1818 | if hasattr(os, 'scandir'): | 1818 | if hasattr(os, 'scandir'): |
1819 | origscandir = os.scandir | 1819 | origscandir = os.scandir |
@@ -2224,9 +2224,8 @@ class CookerParser(object): | |||
2224 | 2224 | ||
2225 | for process in self.processes: | 2225 | for process in self.processes: |
2226 | process.join() | 2226 | process.join() |
2227 | # Added in 3.7, cleans up zombies | 2227 | # clean up zombies |
2228 | if hasattr(process, "close"): | 2228 | process.close() |
2229 | process.close() | ||
2230 | 2229 | ||
2231 | bb.codeparser.parser_cache_save() | 2230 | bb.codeparser.parser_cache_save() |
2232 | bb.codeparser.parser_cache_savemerge() | 2231 | bb.codeparser.parser_cache_savemerge() |