1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-06 11:00:13 +02:00

Force Subversion to overwrite files

This commit is contained in:
Henrik Tunedal 2011-04-01 23:36:29 +02:00
parent 6ae6c23295
commit 347ee22ca3

View File

@ -162,10 +162,12 @@ for app in apps:
print "Git reset failed" print "Git reset failed"
sys.exit(1) sys.exit(1)
elif app['repotype'] == 'svn': elif app['repotype'] == 'svn':
if subprocess.call(['svn', 'update', '-r', thisbuild['commit']], for svncommand in (['svn', 'update', '--force',
cwd=build_dir) != 0: '-r', thisbuild['commit']],
print "Svn update failed" ['svn', 'revert', '-R', '.']):
sys.exit(1) if subprocess.call(svncommand, cwd=build_dir) != 0:
print "Svn update failed"
sys.exit(1)
elif app['repotype'] == 'hg': elif app['repotype'] == 'hg':
if subprocess.call(['hg', 'checkout', thisbuild['commit']], if subprocess.call(['hg', 'checkout', thisbuild['commit']],
cwd=build_dir) != 0: cwd=build_dir) != 0: