bitbake: Fix a bug where changed files weren't getting spotted and an invalid cache was being used

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4148 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 4 insertions, 4 deletions

diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index 9acd301f52..fe38ea0aee 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -208,7 +208,7 @@ class Cache:
             return False
 
         # Check the file's timestamp
-        if mtime > self.getVar("CACHETIMESTAMP", fn, True):
+        if mtime != self.getVar("CACHETIMESTAMP", fn, True):
             bb.msg.debug(2, bb.msg.domain.Cache, "Cache: %s changed" % fn)
             self.remove(fn)
             return False
@@ -223,7 +223,7 @@ class Cache:
                     self.remove(fn)
                     return False
 
-                if (fmtime > old_mtime):
+                if (fmtime != old_mtime):
                     bb.msg.debug(2, bb.msg.domain.Cache, "Cache: %s's dependency %s changed" % (fn, f))
                     self.remove(fn)
                     return False
diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py
index 0c708e3516..f4ae724f87 100644
--- a/bitbake/lib/bb/fetch/git.py
+++ b/bitbake/lib/bb/fetch/git.py
@@ -50,7 +50,7 @@ class Git(Fetch):
         if 'protocol' in ud.parm:
             ud.proto = ud.parm['protocol']
 
-        ud.branch = ud.parm.get("branch", "")
+        ud.branch = ud.parm.get("branch", "master")
 
         tag = Fetch.srcrev_internal_helper(ud, d)
         if tag is True:
@@ -95,7 +95,7 @@ class Git(Fetch):
         os.chdir(repodir)
         # Remove all but the .git directory
         runfetchcmd("rm * -Rf", d)
-        runfetchcmd("git fetch %s://%s%s" % (ud.proto, ud.host, ud.path), d)
+        runfetchcmd("git fetch %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch), d)
         runfetchcmd("git fetch --tags %s://%s%s" % (ud.proto, ud.host, ud.path), d)
         runfetchcmd("git prune-packed", d)
         runfetchcmd("git pack-redundant --all | xargs -r rm", d)