backup_diff

@@ -4,7 +4,6 @@ import os
 import re
 import glob
 import difflib
-import datetime
 
 
 def get_args():
@@ -46,18 +45,13 @@ def find_backups(backupdir, host):
     try:
         with open(f'{basepath}.lastchange', 'r') as f:
             lastchange = f.readlines()[-1].rstrip()
-    except:
-        pass
-    try:
-        info = os.stat(basepath +'.config')
-        mtime = datetime.datetime.fromtimestamp(info.st_mtime).strftime('%F %H:%M:%S (latest)')
-    except:
-        pass
             backups.insert(0, {
-            'since': lastchange or '???',
-            'until': mtime or '???',
+                'since': lastchange,
+                'until': 'now',
                 'cfn': f'{basepath}.config'
                 })
+    except:
+        pass
     return backups
 
 def diff(backups, host, n1, n2):

routerbackup

@@ -369,11 +369,6 @@ class AsaConfig(ConfigWithShell):
         self._shell_command(channel, 'term pager 0', waitfor='#\s*$', waitmax=1)
         shrun = self._shell_command(channel, 'sh run', waitfor=': end')
 
-        # strip late previous lines and command echo
-        for i in range(0, 5):
-            if re.search('^\s*: Saved\s*$', shrun[i]):
-                del shrun[0:i]
-
         iproute = []
         for cmd in ('sh ip address', 'sh route'):
             iproute.append('# '+ cmd.center(76, '='))