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

Two f's if you really really mean it

Browse source
This commit is contained in:
Ciaran Gultnieks 2012-01-29 21:45:34 +00:00
parent 529c64478f
commit c87da3bbeb
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common.py
View file

@ -95,7 +95,7 @@ class vcs_git(vcs):
raise VCSException("Git reset failed") raise VCSException("Git reset failed")
# Remove untracked files now, in case they're tracked in the target # Remove untracked files now, in case they're tracked in the target
# revision (it happens!)... # revision (it happens!)...
if subprocess.call(['git', 'clean', '-dfx'], cwd=self.local) != 0: if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0:
raise VCSException("Git clean failed") raise VCSException("Git clean failed")
if not self.refreshed: if not self.refreshed:
# Get latest commits and tags from remote... # Get latest commits and tags from remote...
@ -110,7 +110,7 @@ class vcs_git(vcs):
if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0: if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0:
raise VCSException("Git checkout failed") raise VCSException("Git checkout failed")
# Get rid of any uncontrolled files left behind... # Get rid of any uncontrolled files left behind...
if subprocess.call(['git', 'clean', '-dfx'], cwd=self.local) != 0: if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0:
raise VCSException("Git clean failed") raise VCSException("Git clean failed")
def initsubmodules(self): def initsubmodules(self):
@ -149,7 +149,7 @@ class vcs_gitsvn(vcs):
raise VCSException("Git reset failed") raise VCSException("Git reset failed")
# Remove untracked files now, in case they're tracked in the target # Remove untracked files now, in case they're tracked in the target
# revision (it happens!)... # revision (it happens!)...
if subprocess.call(['git', 'clean', '-dfx'], cwd=self.local) != 0: if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0:
raise VCSException("Git clean failed") raise VCSException("Git clean failed")
if not self.refreshed: if not self.refreshed:
# Get new commits and tags from repo... # Get new commits and tags from repo...
@ -167,7 +167,7 @@ class vcs_gitsvn(vcs):
if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0: if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0:
raise VCSException("Git checkout failed") raise VCSException("Git checkout failed")
# Get rid of any uncontrolled files left behind... # Get rid of any uncontrolled files left behind...
if subprocess.call(['git', 'clean', '-dfx'], cwd=self.local) != 0: if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0:
raise VCSException("Git clean failed") raise VCSException("Git clean failed")
class vcs_svn(vcs): class vcs_svn(vcs):