mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get rid of more unnecessary finds

Browse source
This commit is contained in:
Daniel Martí 2013-12-20 09:42:10 +01:00
parent efc8317272
commit 99b5d5e387
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/build.py
View file

@ -94,11 +94,11 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
p = subprocess.Popen(['VBoxManage', 'snapshot', get_builder_vm_id(), 'list', '--details'],
cwd='builder', stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
output = p.communicate()[0]
if output.find('fdroidclean') != -1:
if 'fdroidclean' in output:
if options.verbose:
print "...snapshot exists - resetting build server to clean state"
retcode, output = vagrant(['status'], cwd='builder')
if output.find('running') != -1:
if 'running' in output:
if options.verbose:
print "...suspending"
vagrant(['suspend'], cwd='builder')
@ -186,7 +186,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
p = subprocess.Popen(['VBoxManage', 'snapshot', get_builder_vm_id(), 'list', '--details'],
cwd='builder', stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
output = p.communicate()[0]
if output.find('fdroidclean') == -1:
if 'fdroidclean' not in output:
raise BuildException("Failed to take snapshot.")
try: