diff options
Diffstat (limited to 'src/buildstream/utils.py')
| -rw-r--r-- | src/buildstream/utils.py | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/buildstream/utils.py b/src/buildstream/utils.py index 780d43785..cfd253612 100644 --- a/src/buildstream/utils.py +++ b/src/buildstream/utils.py @@ -1365,16 +1365,15 @@ def _deterministic_umask(): def _get_compression(tar): mapped_extensions = {'.tar': '', '.gz': 'gz', '.xz': 'xz', '.bz2': 'bz2'} -# mapped_compressions = {value: key.lstrip(".") for key, value in mapped_extensions.items()} - _, ext = os.path.splitext(tar) - - if ext: - try: - tar = mapped_extensions[ext] - return tar - except KeyError as e: - raise UtilError("ERROR: invalid file extension ('{}') given with --tar".format(ext)) from e + try: + _, ext = os.path.splitext(tar) + if ext: + return mapped_extensions[ext] + + except KeyError as e: + raise UtilError("ERROR: invalid file extension ('{}') given with --tar".format(ext)) from e + except (AttributeError, TypeError): + return mapped_extensions['.tar'] else: - tar = mapped_extensions['.tar'] - return tar + return mapped_extensions['.tar'] |