kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-04 16:30:12 +02:00
Code Activity

vmtools: use standard imports: os.remove()

Browse Source 
The rest of the code uses os.remove()
This commit is contained in:
Hans-Christoph Steiner 2018-01-26 10:18:07 +01:00
parent 4463bf238d
commit f24cf7f71b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fdroidserver/vmtools.py
View File

@ -16,7 +16,6 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# 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.path import isdir, isfile, basename, abspath, expanduser from os.path import isdir, isfile, basename, abspath, expanduser
import os import os
import math import math
@ -376,11 +375,11 @@ class LibvirtBuildVm(FDroidBuildVm):
if storagePool: if storagePool:
if isfile('metadata.json'): if isfile('metadata.json'):
rmfile('metadata.json') os.remove('metadata.json')
if isfile('Vagrantfile'): if isfile('Vagrantfile'):
rmfile('Vagrantfile') os.remove('Vagrantfile')
if isfile('box.img'): if isfile('box.img'):
rmfile('box.img') os.remove('box.img')
logger.debug('preparing box.img for box %s', output) logger.debug('preparing box.img for box %s', output)
vol = storagePool.storageVolLookupByName(self.srvname + '.img') vol = storagePool.storageVolLookupByName(self.srvname + '.img')
@ -430,9 +429,9 @@ class LibvirtBuildVm(FDroidBuildVm):
if not keep_box_file: if not keep_box_file:
logger.debug('box packaging complete, removing temporary files.') logger.debug('box packaging complete, removing temporary files.')
rmfile('metadata.json') os.remove('metadata.json')
rmfile('Vagrantfile') os.remove('Vagrantfile')
rmfile('box.img') os.remove('box.img')
else: else:
logger.warn('could not connect to storage-pool \'default\',' + logger.warn('could not connect to storage-pool \'default\',' +