chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1626655
)
git-svn: use '--' to isolate user input in command lines
author
Hans-Christoph Steiner
<hans@eds.org>
Mon, 5 Feb 2018 12:22:06 +0000
(13:22 +0100)
committer
Hans-Christoph Steiner
<hans@eds.org>
Mon, 12 Feb 2018 11:07:24 +0000
(12:07 +0100)
fdroidserver/common.py
patch
|
blob
|
history
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index 7f44a4d3d5ebeac1e3ed64cf15165699014a9b71..340d296c60f1773dc0eb906380716f79e7c43648 100644
(file)
--- a/
fdroidserver/common.py
+++ b/
fdroidserver/common.py
@@
-975,6
+975,7
@@
class vcs_gitsvn(vcs):
if not os.path.exists(self.local):
# Brand new checkout
gitsvn_args = ['svn', 'clone']
if not os.path.exists(self.local):
# Brand new checkout
gitsvn_args = ['svn', 'clone']
+ remote = None
if ';' in self.remote:
remote_split = self.remote.split(';')
for i in remote_split[1:]:
if ';' in self.remote:
remote_split = self.remote.split(';')
for i in remote_split[1:]:
@@
-984,17
+985,15
@@
class vcs_gitsvn(vcs):
gitsvn_args.extend(['-t', i[5:]])
elif i.startswith('branches='):
gitsvn_args.extend(['-b', i[9:]])
gitsvn_args.extend(['-t', i[5:]])
elif i.startswith('branches='):
gitsvn_args.extend(['-b', i[9:]])
- gitsvn_args.extend([remote_split[0], self.local])
- p = self.git(gitsvn_args, output=False)
- if p.returncode != 0:
- self.clone_failed = True
- raise VCSException("Git svn clone failed", p.output)
+ remote = remote_split[0]
else:
else:
- gitsvn_args.extend([self.remote, self.local])
- p = self.git(gitsvn_args, output=False)
- if p.returncode != 0:
- self.clone_failed = True
- raise VCSException("Git svn clone failed", p.output)
+ remote = self.remote
+
+ gitsvn_args.extend(['--', remote, self.local])
+ p = self.git(gitsvn_args)
+ if p.returncode != 0:
+ self.clone_failed = True
+ raise VCSException(_('git svn clone failed'), p.output)
self.checkrepo()
else:
self.checkrepo()
self.checkrepo()
else:
self.checkrepo()