From e900b9c090c34ba9b4836b161763784d7f762d94 Mon Sep 17 00:00:00 2001 From: William Hesse Date: Tue, 16 Mar 2021 16:58:49 +0000 Subject: [PATCH] [infra] Fix default path to git directory when running GN This should fix the tools/get_dot_git_folder.py script when running the Debian package build from a source tarball. Change-Id: I703fa34bbb6c73763c385e7d05b130091a131ade Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/191401 Reviewed-by: Jens Johansen Reviewed-by: Alexander Thomas --- sdk_args.gni | 5 ++++- tools/get_dot_git_folder.py | 9 ++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sdk_args.gni b/sdk_args.gni index 7e974a5d0fe..736f414fa55 100644 --- a/sdk_args.gni +++ b/sdk_args.gni @@ -20,7 +20,10 @@ declare_args() { # file under the git worktree folder. # The script run here should take care of everything automatically though. default_git_folder = exec_script("$_dart_root/tools/get_dot_git_folder.py", - [ rebase_path("$_dart_root/.git") ], + [ + rebase_path("$_dart_root/.git"), + "$_dart_root/.git", + ], "trim string") # Whether to enable the SDK hash check that will prevent loading a kernel diff --git a/tools/get_dot_git_folder.py b/tools/get_dot_git_folder.py index 4baaba22ec6..443addbfdd8 100755 --- a/tools/get_dot_git_folder.py +++ b/tools/get_dot_git_folder.py @@ -14,9 +14,8 @@ import utils def main(): try: - if len(sys.argv) != 2: - raise Exception('Expects exactly 1 argument.') - + if len(sys.argv) != 3: + raise Exception('Expects exactly 2 arguments.') args = ['git', 'rev-parse', '--resolve-git-dir', sys.argv[1]] windows = utils.GuessOS() == 'win32' @@ -40,8 +39,8 @@ def main(): print(outs.strip()) except: - # Fall-back to ".git". - print(".git") + # Fall back to fall-back path. + print(sys.argv[2]) if __name__ == '__main__':