kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-18 20:50:10 +01:00
Code Activity

git: make explicit that git configs are calling cmd line utilities

Browse Source 
These are not boolean values, but command line utilities which return a
guaranteed exit status.
This commit is contained in:
Hans-Christoph Steiner 2018-02-05 13:23:44 +01:00
parent c67ed5e85f
commit 574fa15fce
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fdroidserver/common.py
View File

@ -815,7 +815,7 @@ class vcs_git(vcs):
# #
# supported in git >= 2.3 # supported in git >= 2.3
git_config = [ git_config = [
'-c', 'core.sshCommand=false', '-c', 'core.sshCommand=/bin/false',
'-c', 'url.https://.insteadOf=ssh://', '-c', 'url.https://.insteadOf=ssh://',
] ]
for domain in ('bitbucket.org', 'github.com', 'gitlab.com'): for domain in ('bitbucket.org', 'github.com', 'gitlab.com'):
@ -827,7 +827,7 @@ class vcs_git(vcs):
git_config.append('url.https://u:p@' + domain + '.insteadOf=https://' + domain) git_config.append('url.https://u:p@' + domain + '.insteadOf=https://' + domain)
envs.update({ envs.update({
'GIT_TERMINAL_PROMPT': '0', 'GIT_TERMINAL_PROMPT': '0',
'GIT_SSH': 'false', # for git < 2.3 'GIT_SSH': '/bin/false', # for git < 2.3
}) })
return FDroidPopen(['git', ] + git_config + args, return FDroidPopen(['git', ] + git_config + args,
envs=envs, cwd=cwd, output=output) envs=envs, cwd=cwd, output=output)
@ -965,8 +965,8 @@ class vcs_gitsvn(vcs):
config = ['-c', 'core.sshCommand=false'] config = ['-c', 'core.sshCommand=false']
envs.update({ envs.update({
'GIT_TERMINAL_PROMPT': '0', 'GIT_TERMINAL_PROMPT': '0',
'GIT_SSH': 'false', # for git < 2.3 'GIT_SSH': '/bin/false', # for git < 2.3
'SVN_SSH': 'false', 'SVN_SSH': '/bin/false',
}) })
return FDroidPopen(['git', ] + config + args, return FDroidPopen(['git', ] + config + args,
envs=envs, cwd=cwd, output=output) envs=envs, cwd=cwd, output=output)