diff options
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index c5e9fa2941..b673fe10ee 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
| @@ -229,24 +229,26 @@ class BBCooker: | |||
| 229 | self.handlePRServ() | 229 | self.handlePRServ() |
| 230 | 230 | ||
| 231 | def setupConfigWatcher(self): | 231 | def setupConfigWatcher(self): |
| 232 | if self.configwatcher: | 232 | with bb.utils.lock_timeout(self.inotify_threadlock): |
| 233 | self.configwatcher.close() | 233 | if self.configwatcher: |
| 234 | self.confignotifier = None | 234 | self.configwatcher.close() |
| 235 | self.configwatcher = None | 235 | self.confignotifier = None |
| 236 | self.configwatcher = pyinotify.WatchManager() | 236 | self.configwatcher = None |
| 237 | self.configwatcher.bbseen = set() | 237 | self.configwatcher = pyinotify.WatchManager() |
| 238 | self.configwatcher.bbwatchedfiles = set() | 238 | self.configwatcher.bbseen = set() |
| 239 | self.confignotifier = pyinotify.Notifier(self.configwatcher, self.config_notifications) | 239 | self.configwatcher.bbwatchedfiles = set() |
| 240 | self.confignotifier = pyinotify.Notifier(self.configwatcher, self.config_notifications) | ||
| 240 | 241 | ||
| 241 | def setupParserWatcher(self): | 242 | def setupParserWatcher(self): |
| 242 | if self.watcher: | 243 | with bb.utils.lock_timeout(self.inotify_threadlock): |
| 243 | self.watcher.close() | 244 | if self.watcher: |
| 244 | self.notifier = None | 245 | self.watcher.close() |
| 245 | self.watcher = None | 246 | self.notifier = None |
| 246 | self.watcher = pyinotify.WatchManager() | 247 | self.watcher = None |
| 247 | self.watcher.bbseen = set() | 248 | self.watcher = pyinotify.WatchManager() |
| 248 | self.watcher.bbwatchedfiles = set() | 249 | self.watcher.bbseen = set() |
| 249 | self.notifier = pyinotify.Notifier(self.watcher, self.notifications) | 250 | self.watcher.bbwatchedfiles = set() |
| 251 | self.notifier = pyinotify.Notifier(self.watcher, self.notifications) | ||
| 250 | 252 | ||
| 251 | def process_inotify_updates(self): | 253 | def process_inotify_updates(self): |
| 252 | with bb.utils.lock_timeout(self.inotify_threadlock): | 254 | with bb.utils.lock_timeout(self.inotify_threadlock): |