mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 16:02:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support for spaces in git-svn tags, fixes

Browse source
This commit is contained in:
Daniel Martí 2013-06-03 11:20:49 +02:00
parent c11464bdd5
commit 785e17428a
1 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
fdroidserver/common.py
View file

@ -235,11 +235,13 @@ class vcs_gitsvn(vcs):
raise VCSException("Git svn rebase failed") raise VCSException("Git svn rebase failed")
self.refreshed = True self.refreshed = True
if rev: if rev:
nospaces_rev = rev.replace(' ', '%20')
# Try finding a svn tag # Try finding a svn tag
p = subprocess.Popen(['git', 'checkout', 'tags/' + rev], p = subprocess.Popen(['git', 'checkout', 'tags/' + nospaces_rev],
cwd=self.local, stderr=subprocess.PIPE) cwd=self.local, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = p.communicate()
if p.returncode == 0: if p.returncode == 0:
print p.communicate()[0] print out
else: else:
# No tag found, normal svn rev translation # No tag found, normal svn rev translation
# Translate svn rev into git format # Translate svn rev into git format
@ -248,11 +250,22 @@ class vcs_gitsvn(vcs):
git_rev = p.communicate()[0].rstrip() git_rev = p.communicate()[0].rstrip()
if p.returncode != 0 or len(git_rev) == 0: if p.returncode != 0 or len(git_rev) == 0:
# Try a plain git checkout as a last resort # Try a plain git checkout as a last resort
if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0: p = subprocess.Popen(['git', 'checkout', rev], cwd=self.local,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = p.communicate()
if p.returncode == 0:
print out
else:
raise VCSException("No git treeish found and direct git checkout failed") raise VCSException("No git treeish found and direct git checkout failed")
# Check out the appropriate git revision... else:
if subprocess.call(['git', 'checkout', git_rev], cwd=self.local) != 0: # Check out the git rev equivalent to the svn rev
raise VCSException("Git checkout failed") p = subprocess.Popen(['git', 'checkout', git_rev], cwd=self.local,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = p.communicate()
if p.returncode == 0:
print out
else:
raise VCSException("Git svn checkout failed")
# Get rid of any uncontrolled files left behind... # Get rid of any uncontrolled files left behind...
if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0: if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0:
raise VCSException("Git clean failed") raise VCSException("Git clean failed")