summaryrefslogtreecommitdiff
path: root/python/vyos
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-12-11 12:07:23 -0600
committerGitHub <noreply@github.com>2023-12-11 12:07:23 -0600
commitf82f1ca1bc55fe75aa6495fe89dbe597055742b5 (patch)
tree4c23010b0ea1550561ea60e03a6d2f1780bde28b /python/vyos
parent787917a89375606380be97cade0d9ed648cdc49f (diff)
parentccbf03f1a87ac37eef78aeb29420ceea9a730a90 (diff)
downloadvyos-1x-f82f1ca1bc55fe75aa6495fe89dbe597055742b5.tar.gz
vyos-1x-f82f1ca1bc55fe75aa6495fe89dbe597055742b5.zip
Merge pull request #2613 from jestabro/num-revisions
T5812: report actual number of revisions instead of max
Diffstat (limited to 'python/vyos')
-rw-r--r--python/vyos/config_mgmt.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/python/vyos/config_mgmt.py b/python/vyos/config_mgmt.py
index 950f14d4f..fd0fa7a75 100644
--- a/python/vyos/config_mgmt.py
+++ b/python/vyos/config_mgmt.py
@@ -125,6 +125,7 @@ class ConfigMgmt:
get_first_key=True)
self.max_revisions = int(d.get('commit_revisions', 0))
+ self.num_revisions = 0
self.locations = d.get('commit_archive', {}).get('location', [])
self.source_address = d.get('commit_archive',
{}).get('source_address', '')
@@ -233,7 +234,7 @@ Proceed ?'''
msg = ''
if not self._check_revision_number(rev):
- msg = f'Invalid revision number {rev}: must be 0 < rev < {self.max_revisions}'
+ msg = f'Invalid revision number {rev}: must be 0 < rev < {self.num_revisions}'
return msg, 1
prompt_str = 'Proceed with reboot ?'
@@ -560,8 +561,8 @@ Proceed ?'''
return len(l)
def _check_revision_number(self, rev: int) -> bool:
- maxrev = self._get_number_of_revisions()
- if not 0 <= rev < maxrev:
+ self.num_revisions = self._get_number_of_revisions()
+ if not 0 <= rev < self.num_revisions:
return False
return True