kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-14 13:00:08 +02:00
Code Activity

Use ImportError for Python < 3.6 (Closes: !734)

Browse Source 
ModuleNotFoundError is a subclass of ImportError, so this should not
change anything.
This commit is contained in:
Jochen Sprickerhof 2020-04-17 23:26:06 +02:00
parent 7f5e0bb310
commit 30c654459f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdroidserver/vmtools.py
View File

@ -435,7 +435,7 @@ class LibvirtBuildVm(FDroidBuildVm):
with libarchive.file_writer(output, 'gnutar', 'gzip') as tar:
logging.debug('adding files to box %s ...', output)
tar.add_files('metadata.json', 'Vagrantfile', 'box.img')
except (ModuleNotFoundError, AttributeError):
except (ImportError, AttributeError):
with tarfile.open(output, 'w:gz') as tar:
logging.debug('adding metadata.json to box %s ...', output)
tar.add('metadata.json')