bitbake/fetch2: Update forcefetch and mirror handling to clean up, simplfy and bug fix the code

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 5 insertions, 6 deletions

diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 55c66cf49a..6bcc4a4838 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -80,7 +80,7 @@ class Git(FetchMethod):
     def localpath(self, url, ud, d):
         return ud.clonedir
 
-    def forcefetch(self, url, ud, d):
+    def need_update(self, u, ud, d):
         if not os.path.exists(ud.clonedir):
             return True
         os.chdir(ud.clonedir)
@@ -90,13 +90,12 @@ class Git(FetchMethod):
         return False
 
     def try_premirror(self, u, ud, d):
-        if 'noclone' in ud.parm:
-            return False
+        # If we don't do this, updating an existing checkout with only premirrors
+        # is not possible
+        if bb.data.getVar("BB_FETCH_PREMIRRORONLY", d, True) is not None:
+            return True
         if os.path.exists(ud.clonedir):
             return False
-        if os.path.exists(ud.localpath):
-            return False
-
         return True
 
     def download(self, loc, ud, d):