From f9c81b121b146fbcf3c458273b2b47e6e571f2e2 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Wed, 2 Oct 2024 12:20:15 -0500
Subject: config-mgmt: T5976: normalize formatting

---
 src/conf_mode/system_config-management.py | 13 +++++++++----
 src/helpers/commit-confirm-notify.py      | 18 +++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/conf_mode/system_config-management.py b/src/conf_mode/system_config-management.py
index c681a8405..99f25bef6 100755
--- a/src/conf_mode/system_config-management.py
+++ b/src/conf_mode/system_config-management.py
@@ -22,6 +22,7 @@ from vyos.config import Config
 from vyos.config_mgmt import ConfigMgmt
 from vyos.config_mgmt import commit_post_hook_dir, commit_hooks
 
+
 def get_config(config=None):
     if config:
         conf = config
@@ -36,22 +37,24 @@ def get_config(config=None):
 
     return mgmt
 
+
 def verify(_mgmt):
     return
 
+
 def generate(mgmt):
     if mgmt is None:
         return
 
     mgmt.initialize_revision()
 
+
 def apply(mgmt):
     if mgmt is None:
         return
 
     locations = mgmt.locations
-    archive_target = os.path.join(commit_post_hook_dir,
-                               commit_hooks['commit_archive'])
+    archive_target = os.path.join(commit_post_hook_dir, commit_hooks['commit_archive'])
     if locations:
         try:
             os.symlink('/usr/bin/config-mgmt', archive_target)
@@ -68,8 +71,9 @@ def apply(mgmt):
             raise ConfigError from exc
 
     revisions = mgmt.max_revisions
-    revision_target = os.path.join(commit_post_hook_dir,
-                               commit_hooks['commit_revision'])
+    revision_target = os.path.join(
+        commit_post_hook_dir, commit_hooks['commit_revision']
+    )
     if revisions > 0:
         try:
             os.symlink('/usr/bin/config-mgmt', revision_target)
@@ -85,6 +89,7 @@ def apply(mgmt):
         except OSError as exc:
             raise ConfigError from exc
 
+
 if __name__ == '__main__':
     try:
         c = get_config()
diff --git a/src/helpers/commit-confirm-notify.py b/src/helpers/commit-confirm-notify.py
index 8d7626c78..69dda5112 100755
--- a/src/helpers/commit-confirm-notify.py
+++ b/src/helpers/commit-confirm-notify.py
@@ -6,15 +6,19 @@ import time
 # Minutes before reboot to trigger notification.
 intervals = [1, 5, 15, 60]
 
+
 def notify(interval):
-    s = "" if interval == 1 else "s"
+    s = '' if interval == 1 else 's'
     time.sleep((minutes - interval) * 60)
-    message = ('"[commit-confirm] System is going to reboot in '
-               f'{interval} minute{s} to rollback the last commit.\n'
-               'Confirm your changes to cancel the reboot."')
-    os.system("wall -n " + message)
+    message = (
+        '"[commit-confirm] System is going to reboot in '
+        f'{interval} minute{s} to rollback the last commit.\n'
+        'Confirm your changes to cancel the reboot."'
+    )
+    os.system('wall -n ' + message)
+
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     # Must be run as root to call wall(1) without a banner.
     if len(sys.argv) != 2 or os.getuid() != 0:
         print('This script requires superuser privileges.', file=sys.stderr)
@@ -27,5 +31,5 @@ if __name__ == "__main__":
     for interval in sorted(intervals, reverse=True):
         if minutes >= interval:
             notify(interval)
-            minutes -= (minutes - interval)
+            minutes -= minutes - interval
     exit(0)
-- 
cgit v1.2.3