mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

makebuildserver deal with apt cache lock

Browse source
This commit is contained in:
Michael Pöhn 2017-04-09 00:57:59 +02:00 • committed by Hans-Christoph Steiner
parent acf25a3999
commit b01d48a4fd
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
makebuildserver
View file

@ -6,6 +6,7 @@ import re
import requests import requests
import stat import stat
import sys import sys
import shutil
import subprocess import subprocess
import vagrant import vagrant
import hashlib import hashlib
@ -114,6 +115,14 @@ if config['vm_provider'] == 'libvirt':
if config['apt_package_cache']: if config['apt_package_cache']:
config['aptcachedir'] = cachedir + '/apt/archives' config['aptcachedir'] = cachedir + '/apt/archives'
logger.debug('aptcachedir is set to %s', config['aptcachedir']) logger.debug('aptcachedir is set to %s', config['aptcachedir'])
aptcachelock = os.path.join(config['aptcachedir'], 'lock')
if os.path.isfile(aptcachelock):
logger.info('apt cache dir is locked, removing lock')
os.remove(aptcachelock)
aptcachepartial = os.path.join(config['aptcachedir'], 'partial')
if os.path.isdir(aptcachepartial):
logger.info('removing partial downloads from apt cache dir')
shutil.rmtree(aptcachepartial)
cachefiles = [ cachefiles = [
('https://dl.google.com/android/repository/tools_r25.2.3-linux.zip', ('https://dl.google.com/android/repository/tools_r25.2.3-linux.zip',
@ -486,9 +495,9 @@ def main():
debug_log_vagrant_vm(serverdir, config['domain']) debug_log_vagrant_vm(serverdir, config['domain'])
try: try:
v.up(provision=True) v.up(provision=True)
except subprocess.CalledProcessError as e: except fdroidserver.vmtools.FDroidBuildVmException as e:
debug_log_vagrant_vm(serverdir, config['domain']) debug_log_vagrant_vm(serverdir, config['domain'])
logger.critical('could not bring buildserver vm up. %s', e) logger.exception('could not bring buildserver vm up. %s', e)
sys.exit(1) sys.exit(1)
if config['copy_caches_from_host']: if config['copy_caches_from_host']: