From 62f6891024e1c2a9a258f76abfec6dbd24ac874d Mon Sep 17 00:00:00 2001
From: Rottler Tamas <tom@bitfit.hu>
Date: Sat, 4 Mar 2023 22:06:17 +0100
Subject: [PATCH] strip garbage from end of comware backup

---
 routerbackup | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/routerbackup b/routerbackup
index e98813c..58d4e65 100755
--- a/routerbackup
+++ b/routerbackup
@@ -397,6 +397,10 @@ class ComwareConfig(ConfigWithShell):
         channel = self.ssh.invoke_shell()
         self._shell_command(channel, 'screen-length disable', waitfor='>\s*$', waitmax=1)
         dicur = self._shell_command(channel, 'display current-configuration', waitfor='(?m:^return\s*$)')
+        # strip garbage after 'return' if return appears *before* last line
+        for i in range(-2, -6, -1):
+            if re.search('^\s*return\s*$', dicur[i]):
+                del dicur[i:]
         self.config = '\n'.join(dicur)
 
     def is_bad_config(self):