Openembedded Core Discussions
 help / color / mirror / Atom feed
* [OE-core][PATCH] fetch2: git: Use samestat() instead of path for repo check
@ 2023-09-13 15:46 Joshua Watt
  2023-09-13 15:48 ` Joshua Watt
  0 siblings, 1 reply; 2+ messages in thread
From: Joshua Watt @ 2023-09-13 15:46 UTC (permalink / raw)
  To: openembedded-core; +Cc: mikko.rapeli, martin.jansa, Joshua Watt

Using path prefixes to check if the git directory is a descendant of the
clone directory can be easily confused with symlinkes and bind mounts,
causing directories to be deleted unnecessarily. Instead, use
os.path.samestat() which is immune to the these sorts of problems. The
code needs manually check all parent directories until it has recursed
up to the root to make sure, but in the common case where the
directories do actually contain the correct git repository, this will
only run a single iteration.

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
 bitbake/lib/bb/fetch2/git.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index e11271b757a..5703ba335e0 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -374,19 +374,25 @@ class Git(FetchMethod):
                 # Since clones can be bare, use --absolute-git-dir instead of --show-toplevel
                 output = runfetchcmd("LANG=C %s rev-parse --absolute-git-dir" % ud.basecmd, d, workdir=ud.clonedir)
 
-                toplevel = os.path.abspath(output.rstrip())
-                abs_clonedir = os.path.abspath(ud.clonedir).rstrip('/')
-                # The top level Git directory must either be the clone directory
-                # or a child of the clone directory. Any ancestor directory of
-                # the clone directory is not valid as the Git directory (and
-                # probably belongs to some other unrelated repository), so a
-                # clone is required
-                if os.path.commonprefix([abs_clonedir, toplevel]) != abs_clonedir:
-                    logger.warning("Top level directory '%s' doesn't match expected '%s'. Re-cloning", toplevel, ud.clonedir)
+                clonedir_stat = os.stat(ud.clonedir)
+                toplevel = os.path.abspath(output.rstrip()).rstrip("/")
+                check_dir = toplevel
+
+                while check_dir:
+                    check_stat = os.stat(check_dir)
+                    if os.path.samestat(check_stat, clonedir_stat):
+                        break
+                    check_dir = os.path.dirname(check_dir).rstrip("/")
+
+                if not check_dir:
+                    logger.warning("Top level directory '%s' is not a descendant of '%s'. Re-cloning", toplevel, ud.clonedir)
                     needs_clone = True
             except bb.fetch2.FetchError as e:
                 logger.warning("Unable to get top level for %s (not a git directory?): %s", ud.clonedir, e)
                 needs_clone = True
+            except FileNotFoundError as e:
+                logger.warning("%s", e)
+                needs_clone = True
 
             if needs_clone:
                 shutil.rmtree(ud.clonedir)
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-13 15:48 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-13 15:46 [OE-core][PATCH] fetch2: git: Use samestat() instead of path for repo check Joshua Watt
2023-09-13 15:48 ` Joshua Watt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox