[oe-commits] [bitbake] 04/10: bitbake: cooker: don't stop file notifier when cooker is shutdown

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit a6a641cb9c5f3abe901b150da915372e295383d7
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Thu Feb 1 23:15:24 2018 +0800

    bitbake: cooker: don't stop file notifier when cooker is shutdown
    
    It should be live/exited with server rather than cooker, fixed:
    $ bitbake --server-only -T -1
    Set MACHINE = "qemux86" in conf/local.conf
    $ bitbake quilt
    Set MACHINE = "qemuppc" in conf/local.conf
    $ bitbake quilt
    [snip]
    ERROR: When reparsing /workspace1/lyang1/poky/meta/recipes-connectivity/openssl/openssl_1.0.2m.bb.do_package, the basehash value changed from c216f7f4fdd3cf4a0b10b975a636426c to d5a8e9431ab261381752d7a64c7b2fa9. The metadata is not deterministic and this needs to be fixed.
    [snip]
    
    This is because the server doesn't know local.conf is changed since the
    notifiers are stopped, so it doesn't reparse, and then we would get the errors,
    let the notifiers live/exited with server can fix the problem.
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/cooker.py         | 2 --
 lib/bb/server/process.py | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index f991c8f..af482f9 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -1604,8 +1604,6 @@ class BBCooker:
 
         if self.parser:
             self.parser.shutdown(clean=not force, force=force)
-        self.notifier.stop()
-        self.confignotifier.stop()
 
     def finishcommand(self):
         self.state = state.initial
diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py
index 3d31355..828159e 100644
--- a/lib/bb/server/process.py
+++ b/lib/bb/server/process.py
@@ -223,6 +223,8 @@ class ProcessServer(multiprocessing.Process):
 
         try: 
             self.cooker.shutdown(True)
+            self.cooker.notifier.stop()
+            self.cooker.confignotifier.stop()
         except:
             pass
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.