kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 22:40:12 +01:00
Code Activity

Forgot to remove "trunk" in git-svn checkout

Browse Source
This commit is contained in:
Daniel Martí 2013-05-28 16:36:52 +02:00
parent 86cff4e49c
commit 5d36f41c3f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fdroidserver/common.py
View File

@ -245,9 +245,8 @@ class vcs_gitsvn(vcs):
cwd=self.local, stdout=subprocess.PIPE) cwd=self.local, stdout=subprocess.PIPE)
rev = p.communicate()[0].rstrip() rev = p.communicate()[0].rstrip()
if p.returncode != 0 or len(rev) == 0: if p.returncode != 0 or len(rev) == 0:
# If it's not a svn rev, do a normal git checkout (master, # Try a plain git checkout as a last resort
# trunk, raw git sha, etc) if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0:
if subprocess.call(['git', 'checkout', 'trunk'], cwd=self.local) != 0:
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... # Check out the appropriate git revision...
if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0: if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0: