Merged upstream changes in ffsubsync

This commit is contained in:
Louis Vézina 2020-08-23 22:38:13 -04:00
parent bb38d5397c
commit 8940ee617d
1 changed files with 5 additions and 5 deletions

View File

@ -63,12 +63,12 @@ def make_test_case(args, npy_savename, sync_was_successful):
preferred_formats = ['gztar', 'bztar', 'xztar', 'zip', 'tar'] preferred_formats = ['gztar', 'bztar', 'xztar', 'zip', 'tar']
for archive_format in preferred_formats: for archive_format in preferred_formats:
if archive_format in supported_formats: if archive_format in supported_formats:
shutil.make_archive(tar_dir, 'gztar', os.curdir, tar_dir) shutil.make_archive(tar_dir, archive_format, os.curdir, tar_dir)
break break
else: else:
logger.error('failed to create test archive; no formats supported ' logger.error('failed to create test archive; no formats supported '
'(this should not happen)') '(this should not happen)')
return 1 return 1
logger.info('...done') logger.info('...done')
finally: finally:
shutil.rmtree(tar_dir) shutil.rmtree(tar_dir)