fetch/__init__.py: Make fetcher timestamp updating non-fatal when permissions don...

diff --git a/ChangeLog b/ChangeLog
index bf998d4..3bcc17a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@ Changes in BitBake 1.8.x:
        - Convert -b option to use taskdata/runqueue
        - Remove digraph and switch to new stamp checking code. exec_task no longer
          honours dependencies
+       - Make fetcher timestamp updating non-fatal when permissions don't allow 
+         updates
 
 Changes in BitBake 1.8.10:
        - Psyco is available only for x86 - do not use it on other architectures.

diff --git a/lib/bb/fetch/__init__.py b/lib/bb/fetch/__init__.py
index 700efcb..4919b9d 100644 (file)
--- a/lib/bb/fetch/__init__.py
+++ b/lib/bb/fetch/__init__.py
@@ -139,13 +139,21 @@ def go(d):
             if not m.forcefetch(u, ud, d) and os.path.exists(ud.md5):
                 # File already present along with md5 stamp file
                 # Touch md5 file to show activity
-                os.utime(ud.md5, None)
+                try:
+                    os.utime(ud.md5, None)
+                except:
+                    # Errors aren't fatal here
+                    pass
                 continue
             lf = bb.utils.lockfile(ud.lockfile)
             if not m.forcefetch(u, ud, d) and os.path.exists(ud.md5):
                 # If someone else fetched this before we got the lock, 
                 # notice and don't try again
-                os.utime(ud.md5, None)
+                try:
+                    os.utime(ud.md5, None)
+                except:
+                    # Errors aren't fatal here
+                    pass
                 bb.utils.unlockfile(lf)
                 continue
         m.go(u, ud, d)