From 7e3b65beb72ea4cc3ca8bfbd0816413217a520d0 Mon Sep 17 00:00:00 2001 From: Gavin Mak Date: Thu, 26 Jan 2023 23:27:51 +0000 Subject: 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 Reviewed-by: Mike Frysinger --- repo | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'repo') diff --git a/repo b/repo index 8030afbd..ce3df054 100755 --- a/repo +++ b/repo @@ -149,7 +149,7 @@ if not REPO_REV: BUG_URL = 'https://bugs.chromium.org/p/gerrit/issues/entry?template=Repo+tool+issue' # increment this whenever we make important changes to this script -VERSION = (2, 30) +VERSION = (2, 32) # increment this if the MAINTAINER_KEYS block is modified KEYRING_VERSION = (2, 3) @@ -265,7 +265,8 @@ else: urllib.error = urllib2 -home_dot_repo = os.path.expanduser('~/.repoconfig') +repo_config_dir = os.getenv('REPO_CONFIG_DIR', os.path.expanduser('~')) +home_dot_repo = os.path.join(repo_config_dir, '.repoconfig') gpg_dir = os.path.join(home_dot_repo, 'gnupg') -- cgit v1.2.3-54-g00ecf