diff options
author | Mike Frysinger <vapier@google.com> | 2022-08-19 05:17:49 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@google.com> | 2022-08-22 20:48:02 +0000 |
commit | d75ca2eb9d83014caa4278c9aaabe94a0b5a67f7 (patch) | |
tree | ef054de664ee15481b8a5c2cd024c2c272e09a87 | |
parent | a010a9f4a061acad3996bc43cf25bbf6c21d4223 (diff) | |
download | git-repo-d75ca2eb9d83014caa4278c9aaabe94a0b5a67f7.tar.gz |
launcher: make missing .repo/repo/repo an error
If the specified repo dir doesn't actually have a `repo` program,
we only show a warning before continuing on, and then we fail in
weird ways. Since we really need the repo dir to contain repo,
have this be fatal and delete the results.
Bug: https://crbug.com/gerrit/13526
Change-Id: Icee4cba96136d470cbb459a81918c40205078f98
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/343538
Reviewed-by: LaMont Jones <lamontjones@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
-rwxr-xr-x | repo | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -624,8 +624,9 @@ def _Init(args, gitc_init=False): | |||
624 | _Checkout(dst, remote_ref, rev, opt.quiet) | 624 | _Checkout(dst, remote_ref, rev, opt.quiet) |
625 | 625 | ||
626 | if not os.path.isfile(os.path.join(dst, 'repo')): | 626 | if not os.path.isfile(os.path.join(dst, 'repo')): |
627 | print("warning: '%s' does not look like a git-repo repository, is " | 627 | print("fatal: '%s' does not look like a git-repo repository, is " |
628 | "REPO_URL set correctly?" % url, file=sys.stderr) | 628 | "--repo-url set correctly?" % url, file=sys.stderr) |
629 | raise CloneFailure() | ||
629 | 630 | ||
630 | os.rename(dst, dst_final) | 631 | os.rename(dst, dst_final) |
631 | 632 | ||