mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-11-04 06:20:12 +01:00
Two f's if you really really mean it
This commit is contained in:
parent
529c64478f
commit
c87da3bbeb
@ -95,7 +95,7 @@ class vcs_git(vcs):
|
||||
raise VCSException("Git reset failed")
|
||||
# Remove untracked files now, in case they're tracked in the target
|
||||
# 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")
|
||||
if not self.refreshed:
|
||||
# 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:
|
||||
raise VCSException("Git checkout failed")
|
||||
# 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")
|
||||
|
||||
def initsubmodules(self):
|
||||
@ -149,7 +149,7 @@ class vcs_gitsvn(vcs):
|
||||
raise VCSException("Git reset failed")
|
||||
# Remove untracked files now, in case they're tracked in the target
|
||||
# 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")
|
||||
if not self.refreshed:
|
||||
# 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:
|
||||
raise VCSException("Git checkout failed")
|
||||
# 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")
|
||||
|
||||
class vcs_svn(vcs):
|
||||
|
Loading…
Reference in New Issue
Block a user