|
|
@ -149,7 +149,7 @@ if not REPO_REV:
|
|
|
|
BUG_URL = 'https://bugs.chromium.org/p/gerrit/issues/entry?template=Repo+tool+issue'
|
|
|
|
BUG_URL = 'https://bugs.chromium.org/p/gerrit/issues/entry?template=Repo+tool+issue'
|
|
|
|
|
|
|
|
|
|
|
|
# increment this whenever we make important changes to this script
|
|
|
|
# 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
|
|
|
|
# increment this if the MAINTAINER_KEYS block is modified
|
|
|
|
KEYRING_VERSION = (2, 3)
|
|
|
|
KEYRING_VERSION = (2, 3)
|
|
|
@ -265,7 +265,8 @@ else:
|
|
|
|
urllib.error = urllib2
|
|
|
|
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')
|
|
|
|
gpg_dir = os.path.join(home_dot_repo, 'gnupg')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -447,8 +448,7 @@ def run_command(cmd, **kwargs):
|
|
|
|
except UnicodeError:
|
|
|
|
except UnicodeError:
|
|
|
|
print('repo: warning: Invalid UTF-8 output:\ncmd: %r\n%r' % (cmd, output),
|
|
|
|
print('repo: warning: Invalid UTF-8 output:\ncmd: %r\n%r' % (cmd, output),
|
|
|
|
file=sys.stderr)
|
|
|
|
file=sys.stderr)
|
|
|
|
# TODO(vapier): Once we require Python 3, use 'backslashreplace'.
|
|
|
|
return output.decode('utf-8', 'backslashreplace')
|
|
|
|
return output.decode('utf-8', 'replace')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Run & package the results.
|
|
|
|
# Run & package the results.
|
|
|
|
proc = subprocess.Popen(cmd, **kwargs)
|
|
|
|
proc = subprocess.Popen(cmd, **kwargs)
|
|
|
|