diff --git a/config/dpkg/changelog b/config/dpkg/changelog index 42e1ec0..80fc64e 100644 --- a/config/dpkg/changelog +++ b/config/dpkg/changelog @@ -1,5 +1,5 @@ -dfimagetools (20240211-1) unstable; urgency=low +dfimagetools (20240301-1) unstable; urgency=low * Auto-generated - -- Log2Timeline maintainers Sun, 11 Feb 2024 08:09:36 +0100 + -- Log2Timeline maintainers Fri, 01 Mar 2024 10:18:45 +0100 diff --git a/dfimagetools/__init__.py b/dfimagetools/__init__.py index 88ce822..78f344f 100644 --- a/dfimagetools/__init__.py +++ b/dfimagetools/__init__.py @@ -2,4 +2,4 @@ """Collection of tools to process storage media images.""" -__version__ = '20240211' +__version__ = '20240301' diff --git a/dfimagetools/scripts/extract_data_streams.py b/dfimagetools/scripts/extract_data_streams.py index 3545b19..293d577 100755 --- a/dfimagetools/scripts/extract_data_streams.py +++ b/dfimagetools/scripts/extract_data_streams.py @@ -210,7 +210,7 @@ def Main(): print('') return 1 - except KeyboardInterrupt: + except (KeyboardInterrupt, dfvfs_errors.UserAbort): print('Aborted by user.', file=sys.stderr) print('') return 1 diff --git a/dfimagetools/scripts/list_file_entries.py b/dfimagetools/scripts/list_file_entries.py index b66ecf9..f2390e0 100755 --- a/dfimagetools/scripts/list_file_entries.py +++ b/dfimagetools/scripts/list_file_entries.py @@ -172,7 +172,7 @@ def Main(): print('') return 1 - except KeyboardInterrupt: + except (KeyboardInterrupt, dfvfs_errors.UserAbort): print('Aborted by user.', file=sys.stderr) print('') return 1 diff --git a/dfimagetools/scripts/map_extents.py b/dfimagetools/scripts/map_extents.py index f0d946f..b3aa5a9 100755 --- a/dfimagetools/scripts/map_extents.py +++ b/dfimagetools/scripts/map_extents.py @@ -88,7 +88,7 @@ def Main(): print(f'[ERROR] {exception!s}', file=sys.stderr) return 1 - except KeyboardInterrupt: + except (KeyboardInterrupt, dfvfs_errors.UserAbort): print('Aborted by user.', file=sys.stderr) return 1 diff --git a/dfimagetools/scripts/recursive_hasher.py b/dfimagetools/scripts/recursive_hasher.py index 4573fcb..021a84a 100755 --- a/dfimagetools/scripts/recursive_hasher.py +++ b/dfimagetools/scripts/recursive_hasher.py @@ -78,7 +78,7 @@ def Main(): print('') return 1 - except KeyboardInterrupt: + except (KeyboardInterrupt, dfvfs_errors.UserAbort): print('Aborted by user.', file=sys.stderr) print('') return 1 diff --git a/dfimagetools/scripts/source_analyzer.py b/dfimagetools/scripts/source_analyzer.py index ed1c8e6..de71315 100755 --- a/dfimagetools/scripts/source_analyzer.py +++ b/dfimagetools/scripts/source_analyzer.py @@ -7,6 +7,7 @@ import sys from dfvfs.helpers import command_line as dfvfs_command_line +from dfvfs.lib import errors as dfvfs_errors from dfimagetools import source_analyzer from dfimagetools.helpers import backend @@ -70,7 +71,7 @@ def Main(): print('Completed.') - except KeyboardInterrupt: + except (KeyboardInterrupt, dfvfs_errors.UserAbort): print('Aborted by user.') return 1 diff --git a/setup.cfg b/setup.cfg index 4d963fa..852937e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = dfimagetools -version = 20240229 +version = 20240301 description = Storage media image tools long_description = Collection of tools to process storage media images. long_description_content_type = text/plain