Jelajahi Sumber

[win-bootstrap] Exit with error if no Git in PATH

Bug: b/360206460
Change-Id: I5da52de0e050f4e6b9e484052d1e9ddacb79e8ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6171044
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Reviewed-by: Allen Li <ayatane@chromium.org>
Commit-Queue: Anne Redulla <aredulla@google.com>
Anne Redulla 7 bulan lalu
induk
melakukan
db9a0b01c2
1 mengubah file dengan 5 tambahan dan 4 penghapusan
  1. 5 4
      bootstrap/bootstrap.py

+ 5 - 4
bootstrap/bootstrap.py

@@ -485,12 +485,13 @@ def main(argv):
     clean_up_old_installations(bootstrap_dir)
     clean_up_old_installations(bootstrap_dir)
 
 
     if IS_WIN:
     if IS_WIN:
+        # Search for a Git installation.
         git_dir = search_win_git_directory()
         git_dir = search_win_git_directory()
         if not git_dir:
         if not git_dir:
-            # Either using system git was not enabled
-            # or git was not found in PATH.
-            # Fall back to depot_tools bundled git.
-            git_dir = os.path.join(bootstrap_dir, 'git')
+            logging.error('Failed to bootstrap depot_tools.\n'
+                          'Git was not found in PATH. Have you installed it?')
+            return 1
+
         template = template._replace(GIT_BIN_ABSDIR=git_dir)
         template = template._replace(GIT_BIN_ABSDIR=git_dir)
         git_postprocess(template)
         git_postprocess(template)
         templates = [
         templates = [