summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2/git.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/fetch2/git.py')
-rw-r--r--bitbake/lib/bb/fetch2/git.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 33895e09b2..e11271b757 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -373,10 +373,7 @@ class Git(FetchMethod):
373 try: 373 try:
374 # Since clones can be bare, use --absolute-git-dir instead of --show-toplevel 374 # Since clones can be bare, use --absolute-git-dir instead of --show-toplevel
375 output = runfetchcmd("LANG=C %s rev-parse --absolute-git-dir" % ud.basecmd, d, workdir=ud.clonedir) 375 output = runfetchcmd("LANG=C %s rev-parse --absolute-git-dir" % ud.basecmd, d, workdir=ud.clonedir)
376 except bb.fetch2.FetchError as e: 376
377 logger.warning("Unable to get top level for %s (not a git directory?): %s", ud.clonedir, e)
378 needs_clone = True
379 else:
380 toplevel = os.path.abspath(output.rstrip()) 377 toplevel = os.path.abspath(output.rstrip())
381 abs_clonedir = os.path.abspath(ud.clonedir).rstrip('/') 378 abs_clonedir = os.path.abspath(ud.clonedir).rstrip('/')
382 # The top level Git directory must either be the clone directory 379 # The top level Git directory must either be the clone directory
@@ -387,6 +384,9 @@ class Git(FetchMethod):
387 if os.path.commonprefix([abs_clonedir, toplevel]) != abs_clonedir: 384 if os.path.commonprefix([abs_clonedir, toplevel]) != abs_clonedir:
388 logger.warning("Top level directory '%s' doesn't match expected '%s'. Re-cloning", toplevel, ud.clonedir) 385 logger.warning("Top level directory '%s' doesn't match expected '%s'. Re-cloning", toplevel, ud.clonedir)
389 needs_clone = True 386 needs_clone = True
387 except bb.fetch2.FetchError as e:
388 logger.warning("Unable to get top level for %s (not a git directory?): %s", ud.clonedir, e)
389 needs_clone = True
390 390
391 if needs_clone: 391 if needs_clone:
392 shutil.rmtree(ud.clonedir) 392 shutil.rmtree(ud.clonedir)