diff mbox series

gitsm: Fix path construction for relative submodule URI

Message ID 20230224165054.304484-1-mac@mcrowe.com
State Accepted, archived
Commit 47b271e6c8d96960ebe70f80e58f30cc4cbf42e1
Headers show
Series gitsm: Fix path construction for relative submodule URI | expand

Commit Message

Mike Crowe Feb. 24, 2023, 4:50 p.m. UTC 
The submodule repository URI contains a path to something not
necessarily on the local filesystem. This means that we can't use
realpath to normalise it without risking getting bad results if the path
happens to match something on the local filesystem. This situation can
cause very confusing errors if that matching local path happens to be a
symlink to somewhere else.

Using normpath rather than realpath means that the path simplification
follows simple rules on the string rather than looking at the local
filesystem and avoids problems.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Co-authored-by: Dave Craig
---
 lib/bb/fetch2/gitsm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.30.2

BrightSign considers your privacy to be very important. The emails you send to us will be protected and secured. Furthermore, we will only use your email and contact information for the reasons you sent them to us and for tracking how effectively we respond to your requests.
diff mbox series

Patch

diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py
index fee40cdcb..f8e239bc5 100644
--- a/lib/bb/fetch2/gitsm.py
+++ b/lib/bb/fetch2/gitsm.py
@@ -90,7 +90,7 @@  class GitSM(Git):
                 # Convert relative to absolute uri based on parent uri
                 if  uris[m].startswith('..') or uris[m].startswith('./'):
                     newud = copy.copy(ud)
-                    newud.path = os.path.realpath(os.path.join(newud.path, uris[m]))
+                    newud.path = os.path.normpath(os.path.join(newud.path, uris[m]))
                     uris[m] = Git._get_repo_url(self, newud)

         for module in submodules: