From e872d79677e394a19fe81b3fc3e314853f8b36be Mon Sep 17 00:00:00 2001 From: Edwin Eefting Date: Mon, 25 Sep 2017 13:46:20 +0200 Subject: [PATCH] conflicting name --- zfs_autobackup | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zfs_autobackup b/zfs_autobackup index 58593d4..b3d54f5 100755 --- a/zfs_autobackup +++ b/zfs_autobackup @@ -488,13 +488,13 @@ def zfs_autobackup(): if latest_target_snapshot not in source_snapshots[source_filesystem]: #cant find latest target anymore. find first common snapshot and inform user - error="Cant find latest target snapshot on source, did you destroy it accidently? "+source_filesystem+"@"+latest_target_snapshot + error_msg="Cant find latest target snapshot on source, did you destroy it accidently? "+source_filesystem+"@"+latest_target_snapshot for latest_target_snapshot in reversed(target_snapshots[target_filesystem]): if latest_target_snapshot in source_snapshots[source_filesystem]: - error=error+"\nYou could solve this by rolling back to: "+target_filesystem+"@"+latest_target_snapshot; + error_msg=error_msg+"\nYou could solve this by rolling back to: "+target_filesystem+"@"+latest_target_snapshot; break - raise(Exception(error)) + raise(Exception(error_msg)) #send all new source snapshots that come AFTER the last target snapshot latest_source_index=source_snapshots[source_filesystem].index(latest_target_snapshot)