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

vmtools: use standard imports: os.path.join()

Browse Source 
The rest of the code uses os.path.join()
This commit is contained in:
Hans-Christoph Steiner 2018-01-26 10:17:19 +01:00
parent 099c98bc60
commit 4463bf238d
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fdroidserver/vmtools.py
View File

@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from os import remove as rmfile from os import remove as rmfile
from os.path import isdir, isfile, join as joinpath, basename, abspath, expanduser from os.path import isdir, isfile, basename, abspath, expanduser
import os import os
import math import math
import json import json
@ -147,9 +147,9 @@ def get_build_vm(srvdir, provider=None):
logger.debug('could not confirm that either virtualbox or kvm/libvirt are installed') logger.debug('could not confirm that either virtualbox or kvm/libvirt are installed')
# try guessing provider from .../srvdir/.vagrant internals # try guessing provider from .../srvdir/.vagrant internals
has_libvirt_machine = isdir(joinpath(abssrvdir, '.vagrant', has_libvirt_machine = isdir(os.path.join(abssrvdir, '.vagrant',
'machines', 'default', 'libvirt')) 'machines', 'default', 'libvirt'))
has_vbox_machine = isdir(joinpath(abssrvdir, '.vagrant', has_vbox_machine = isdir(os.path.join(abssrvdir, '.vagrant',
'machines', 'default', 'virtualbox')) 'machines', 'default', 'virtualbox'))
if has_libvirt_machine and has_vbox_machine: if has_libvirt_machine and has_vbox_machine:
logger.info('build vm provider lookup found virtualbox and libvirt, defaulting to \'virtualbox\'') logger.info('build vm provider lookup found virtualbox and libvirt, defaulting to \'virtualbox\'')
@ -183,7 +183,7 @@ class FDroidBuildVm():
""" """
self.srvdir = srvdir self.srvdir = srvdir
self.srvname = basename(srvdir) + '_default' self.srvname = basename(srvdir) + '_default'
self.vgrntfile = joinpath(srvdir, 'Vagrantfile') self.vgrntfile = os.path.join(srvdir, 'Vagrantfile')
self.srvuuid = self._vagrant_fetch_uuid() self.srvuuid = self._vagrant_fetch_uuid()
if not isdir(srvdir): if not isdir(srvdir):
raise FDroidBuildVmException("Can not init vagrant, directory %s not present" % (srvdir)) raise FDroidBuildVmException("Can not init vagrant, directory %s not present" % (srvdir))
@ -229,7 +229,7 @@ class FDroidBuildVm():
logger.debug('vagrant destroy completed') logger.debug('vagrant destroy completed')
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
logger.exception('vagrant destroy failed: %s', e) logger.exception('vagrant destroy failed: %s', e)
vgrntdir = joinpath(self.srvdir, '.vagrant') vgrntdir = os.path.join(self.srvdir, '.vagrant')
try: try:
shutil.rmtree(vgrntdir) shutil.rmtree(vgrntdir)
logger.debug('deleted vagrant dir: %s', vgrntdir) logger.debug('deleted vagrant dir: %s', vgrntdir)
@ -253,16 +253,16 @@ class FDroidBuildVm():
return name.replace('/', '-VAGRANTSLASH-') return name.replace('/', '-VAGRANTSLASH-')
def _vagrant_fetch_uuid(self): def _vagrant_fetch_uuid(self):
if isfile(joinpath(self.srvdir, '.vagrant')): if isfile(os.path.join(self.srvdir, '.vagrant')):
# Vagrant 1.0 - it's a json file... # Vagrant 1.0 - it's a json file...
with open(joinpath(self.srvdir, '.vagrant')) as f: with open(os.path.join(self.srvdir, '.vagrant')) as f:
id = json.load(f)['active']['default'] id = json.load(f)['active']['default']
logger.debug('vm uuid: %s', id) logger.debug('vm uuid: %s', id)
return id return id
elif isfile(joinpath(self.srvdir, '.vagrant', 'machines', elif isfile(os.path.join(self.srvdir, '.vagrant', 'machines',
'default', self.provider, 'id')): 'default', self.provider, 'id')):
# Vagrant 1.2 (and maybe 1.1?) it's a directory tree... # Vagrant 1.2 (and maybe 1.1?) it's a directory tree...
with open(joinpath(self.srvdir, '.vagrant', 'machines', with open(os.path.join(self.srvdir, '.vagrant', 'machines',
'default', self.provider, 'id')) as f: 'default', self.provider, 'id')) as f:
id = f.read() id = f.read()
logger.debug('vm uuid: %s', id) logger.debug('vm uuid: %s', id)
@ -288,7 +288,7 @@ class FDroidBuildVm():
_check_call(['vagrant', 'box', 'remove', '--all', '--force', boxname]) _check_call(['vagrant', 'box', 'remove', '--all', '--force', boxname])
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
logger.debug('tried removing box %s, but is did not exist: %s', boxname, e) logger.debug('tried removing box %s, but is did not exist: %s', boxname, e)
boxpath = joinpath(expanduser('~'), '.vagrant', boxpath = os.path.join(expanduser('~'), '.vagrant',
self._vagrant_file_name(boxname)) self._vagrant_file_name(boxname))
if isdir(boxpath): if isdir(boxpath):
logger.info("attempting to remove box '%s' by deleting: %s", logger.info("attempting to remove box '%s' by deleting: %s",