[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7744/8267] bitbake: cooker: fix watching empty directories

[Emmanuele Bassi <ebassi src gnome org>]

commit a9b1aaced19bdafe5e3fb33cf455555d30b1a3ab
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Thu Sep 14 16:09:41 2017 +1200

    bitbake: cooker: fix watching empty directories
    
    The code that was supposed to watch directories along BBFILES for
    creation of new files wasn't working in the case where the directory did
    not initially contain any matching files - since in updateCache() we are
    passing the directory path to add_filewatch() and the latter function
    calls os.path.dirname() on the path on the assumption that it is a file
    path, and thus the parent of the directory got watched but not the
    directory itself. (If the directory wasn't empty everything worked fine
    since add_filewatch() was called elsewhere with the path to one of the
    files in that directory, and thus the directory got watched). Add a
    parameter to add_filewatch() to tell it we are passing it directory
    path(s) rather than file path(s).
    
    (Bitbake rev: 47a34dee08fcc25d896a1bdf16fa86267f0b898f)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/cooker.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 8fe36eb..6de04fc 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -266,12 +266,15 @@ class BBCooker:
             self.inotify_modified_files.append(event.pathname)
         self.parsecache_valid = False
 
-    def add_filewatch(self, deps, watcher=None):
+    def add_filewatch(self, deps, watcher=None, dirs=False):
         if not watcher:
             watcher = self.watcher
         for i in deps:
             watcher.bbwatchedfiles.append(i[0])
-            f = os.path.dirname(i[0])
+            if dirs:
+                f = i[0]
+            else:
+                f = os.path.dirname(i[0])
             if f in watcher.bbseen:
                 continue
             watcher.bbseen.append(f)
@@ -1512,7 +1515,7 @@ class BBCooker:
 
             # Add inotify watches for directories searched for bb/bbappend files
             for dirent in searchdirs:
-                self.add_filewatch([[dirent]])
+                self.add_filewatch([[dirent]], dirs=True)
 
             self.parser = CookerParser(self, filelist, masked)
             self.parsecache_valid = True