diff options
author | Christian Poessinger <christian@poessinger.com> | 2019-12-04 17:13:59 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2019-12-04 17:13:59 +0100 |
commit | a96ffc33cc63918ba3815f66c506c717a8676621 (patch) | |
tree | f883f5976a40f2066f500363931a5e499374b8de /src/utils | |
parent | 26677aa3ce312a5b980ea88d57feebd09e39fd98 (diff) | |
parent | aceb4d7e187a571019e4bc24cd23efc7c2f624fe (diff) | |
download | vyos-1x-a96ffc33cc63918ba3815f66c506c717a8676621.tar.gz vyos-1x-a96ffc33cc63918ba3815f66c506c717a8676621.zip |
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x:
shutdown: T1826: Modify cancel reboot msg
T1801: move escaping of backslashes into configtree
vxlan: T1636: remove unused import statements
geneve: T1799: remove unused import statements
Diffstat (limited to 'src/utils')
-rwxr-xr-x | src/utils/vyos-config-to-commands | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/utils/vyos-config-to-commands b/src/utils/vyos-config-to-commands index 7147bc5ff..8b50f7c5d 100755 --- a/src/utils/vyos-config-to-commands +++ b/src/utils/vyos-config-to-commands @@ -19,14 +19,6 @@ else: except OSError as e: print("Could not read config file {0}: {1}".format(file_name, e), file=sys.stderr) -# This script is usually called with the output of "cli-shell-api showCfg", which does not -# escape backslashes. "ConfigTree()" expects escaped backslashes when parsing a config -# string (and also prints them itself). Therefore this script would fail. -# Manually escape backslashes here to handle backslashes in any configuration strings -# properly. The alternative would be to modify the output of "cli-shell-api showCfg", -# but that may be break other things who rely on that specific output. -config_string = config_string.replace("\\", "\\\\") - try: config = ConfigTree(config_string) commands = config.to_commands() |