diff options
author | Gavin Mak <gavinmak@google.com> | 2023-01-26 23:27:51 +0000 |
---|---|---|
committer | Gavin Mak <gavinmak@google.com> | 2023-01-28 02:05:52 +0000 |
commit | 7e3b65beb72ea4cc3ca8bfbd0816413217a520d0 (patch) | |
tree | 0b53df44ed1644a5878a72dc8613fd160cfc3074 /repo | |
parent | c3d61ec2529790bb690071e229511cc641cea5ad (diff) | |
download | git-repo-7e3b65beb72ea4cc3ca8bfbd0816413217a520d0.tar.gz |
Enable use of REPO_CONFIG_DIR to customize .repoconfig location
For use cases with multiple instances of repo, eg some CI environments.
Bug: https://crbug.com/gerrit/15803
Change-Id: I65c1cfc8f6a98adfeb5efefc7ac6b45bf8e134de
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/356719
Tested-by: Gavin Mak <gavinmak@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
Diffstat (limited to 'repo')
-rwxr-xr-x | repo | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -149,7 +149,7 @@ if not REPO_REV: | |||
149 | BUG_URL = 'https://bugs.chromium.org/p/gerrit/issues/entry?template=Repo+tool+issue' | 149 | BUG_URL = 'https://bugs.chromium.org/p/gerrit/issues/entry?template=Repo+tool+issue' |
150 | 150 | ||
151 | # increment this whenever we make important changes to this script | 151 | # increment this whenever we make important changes to this script |
152 | VERSION = (2, 30) | 152 | VERSION = (2, 32) |
153 | 153 | ||
154 | # increment this if the MAINTAINER_KEYS block is modified | 154 | # increment this if the MAINTAINER_KEYS block is modified |
155 | KEYRING_VERSION = (2, 3) | 155 | KEYRING_VERSION = (2, 3) |
@@ -265,7 +265,8 @@ else: | |||
265 | urllib.error = urllib2 | 265 | urllib.error = urllib2 |
266 | 266 | ||
267 | 267 | ||
268 | home_dot_repo = os.path.expanduser('~/.repoconfig') | 268 | repo_config_dir = os.getenv('REPO_CONFIG_DIR', os.path.expanduser('~')) |
269 | home_dot_repo = os.path.join(repo_config_dir, '.repoconfig') | ||
269 | gpg_dir = os.path.join(home_dot_repo, 'gnupg') | 270 | gpg_dir = os.path.join(home_dot_repo, 'gnupg') |
270 | 271 | ||
271 | 272 | ||