strip garbage from end of comware backup

2023-03-04 22:06:17 +01:00 · 2023-03-04 22:06:17 +01:00 · 62f6891024
commit 62f6891024
parent 7961bb6ce7
1 changed files with 4 additions and 0 deletions
--- a/4
+++ b/4
@ -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):