kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-02 09:10:11 +02:00
Code Activity

vmtools: in KVM mode, only call sudo hack when file is not readable

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2017-11-29 20:04:18 +01:00
parent b1bab81739
commit 27d332c8ae
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdroidserver/vmtools.py
View File

@ -29,6 +29,8 @@ import textwrap
from .common import FDroidException
from logging import getLogger
from fdroidserver import _
logger = getLogger('fdroidserver-vmtools')
@ -383,6 +385,8 @@ class LibvirtBuildVm(FDroidBuildVm):
vol = storagePool.storageVolLookupByName(self.srvname + '.img')
imagepath = vol.path()
# TODO use a libvirt storage pool to ensure the img file is readable
if not os.access(imagepath, os.R_OK):
logger.warning(_('Cannot read "{path}"!').format(path=imagepath))
_check_call(['sudo', '/bin/chmod', '-R', 'a+rX', '/var/lib/libvirt/images'])
shutil.copy2(imagepath, 'box.img')
_check_call(['qemu-img', 'rebase', '-p', '-b', '', 'box.img'])