Skip to content

Commit

Permalink
Merge pull request #44 from djotaku/updated_logging
Browse files Browse the repository at this point in the history
Updating logging
  • Loading branch information
djotaku authored Feb 20, 2023
2 parents 3db5df7 + 7969ba4 commit e2fb001
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion snapintime/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
__author__ = "Eric Mesa"
__version__ = "2.0.0"
__version__ = "2.1.0"
__license__ = "GNU GPL v3.0"
__copyright__: str = "(c) 2014 - 2022 Eric Mesa"
__email__: str = "ericsbinaryworld at gmail dot com"
Expand Down
3 changes: 2 additions & 1 deletion snapintime/culling.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def btrfs_del(directory: str, subvols: list, remote: bool = False, remote_locati
error_text = f"Ran {e.args[1]} with a return code of {e.returncode}.\nResult was {str(e.stderr)}" # type: ignore
return_list.append(error_text)
else:
return_list = ["There was either only one or no subvolumes at that date"]
return_list = [f"There was either only one or no subvolumes in {directory} at that date"]
return return_list


Expand Down Expand Up @@ -155,6 +155,7 @@ def cull_seven_days_ago(configuration: dict, remote: bool = False) -> list:
for subvol in configuration.values():
location: str = "remote_subvol_dir" if remote else "backuplocation"
subvols_seven_days_ago = get_subvols_by_date(subvol.get(location), seven_days_ago_reg_ex)
log.debug(f"for {subvol.get(location)} {subvols_seven_days_ago=}")
if remote:
subvols_seven_days_ago = remove_protected(subvol, subvols_seven_days_ago)
if len(subvols_seven_days_ago) != 0:
Expand Down

0 comments on commit e2fb001

Please sign in to comment.