From 574fa15fce6e0bda0272a80b0627a71845bd9583 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 5 Feb 2018 13:23:44 +0100 Subject: [PATCH] git: make explicit that git configs are calling cmd line utilities These are not boolean values, but command line utilities which return a guaranteed exit status. --- fdroidserver/common.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 340d296c..86d1a7d1 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -815,7 +815,7 @@ class vcs_git(vcs): # # supported in git >= 2.3 git_config = [ - '-c', 'core.sshCommand=false', + '-c', 'core.sshCommand=/bin/false', '-c', 'url.https://.insteadOf=ssh://', ] 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) envs.update({ '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, envs=envs, cwd=cwd, output=output) @@ -965,8 +965,8 @@ class vcs_gitsvn(vcs): config = ['-c', 'core.sshCommand=false'] envs.update({ 'GIT_TERMINAL_PROMPT': '0', - 'GIT_SSH': 'false', # for git < 2.3 - 'SVN_SSH': 'false', + 'GIT_SSH': '/bin/false', # for git < 2.3 + 'SVN_SSH': '/bin/false', }) return FDroidPopen(['git', ] + config + args, envs=envs, cwd=cwd, output=output)