From 8daa8c5a941d93e092d1c2fdf2c2a86f162f9d82 Mon Sep 17 00:00:00 2001 From: Josip Sokcevic Date: Thu, 9 Mar 2023 18:06:21 +0000 Subject: [PATCH] Update repo_launcher to 2.32 R=vapier@google.com Change-Id: Ie9310706fb1f9d295fe5f0649788b674679f7f66 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4326268 Commit-Queue: Mike Frysinger Auto-Submit: Josip Sokcevic Reviewed-by: Mike Frysinger --- repo_launcher | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo_launcher b/repo_launcher index c16282036..dd9c4c601 100755 --- a/repo_launcher +++ b/repo_launcher @@ -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') @@ -447,8 +448,7 @@ def run_command(cmd, **kwargs): except UnicodeError: print('repo: warning: Invalid UTF-8 output:\ncmd: %r\n%r' % (cmd, output), file=sys.stderr) - # TODO(vapier): Once we require Python 3, use 'backslashreplace'. - return output.decode('utf-8', 'replace') + return output.decode('utf-8', 'backslashreplace') # Run & package the results. proc = subprocess.Popen(cmd, **kwargs)