From a22fe6f1e4025dec3ecd07af52e98765441af3c3 Mon Sep 17 00:00:00 2001
From: Rottler Tamas <tom@bitfit.hu>
Date: Sat, 4 Mar 2023 23:05:10 +0100
Subject: [PATCH] keep 'return' line in comware config

---
 routerbackup | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/routerbackup b/routerbackup
index 58d4e65..5d6c47d 100755
--- a/routerbackup
+++ b/routerbackup
@@ -397,10 +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):
+        # strip garbage after 'return' line
+        for i in range(-2, -6, -1): # -2! (-1 would delete all if return is on last line)
             if re.search('^\s*return\s*$', dicur[i]):
-                del dicur[i:]
+                del dicur[i+1:]
         self.config = '\n'.join(dicur)
 
     def is_bad_config(self):