Merge pull request #5377 from l0crian1/better-fw-error-output

firewall: T7552: Output rule in verify_rule() ConfigError messages

1 files changed, 2 insertions, 2 deletions

diff --git a/python/vyos/base.py b/python/vyos/base.py
index 67f92564e..6b57eaf8e 100644
--- a/python/vyos/base.py
+++ b/python/vyos/base.py
@@ -64,8 +64,8 @@ class DeprecationWarning():
 
 class ConfigError(Exception):
     def __init__(self, message):
-        # Reformat the message and trim it to 72 characters in length
-        message = fill(message, width=72)
+        # Wrap each line separately so intentional newlines are preserved
+        message = '\n'.join(fill(line, width=72) for line in message.split('\n'))
         # Call the base class constructor with the parameters it needs
         super().__init__(message)