mirror/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2026-01-30 02:01:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_import_error' into 'master'

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

See merge request fdroid/fdroidserver!739
This commit is contained in:
Michael Pöhn
2020-04-18 02:37:35 +00:00
parent 7f5e0bb310 30c654459f
commit bb43dcf00e
1 changed files with 1 additions and 1 deletions
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')