summaryrefslogtreecommitdiff
path: root/python/vyos/config.py
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-12-06 21:07:46 +0100
committerChristian Poessinger <christian@poessinger.com>2019-12-06 21:07:46 +0100
commitbebd084651b50171e696af232a9c403f69ac6230 (patch)
tree6fc3a74465c94f1536d77fd3fc0f0dcc9cf47148 /python/vyos/config.py
parenta96ffc33cc63918ba3815f66c506c717a8676621 (diff)
parent1ac177febfdd0dfc5a5b40a1b30294de0e2a45e0 (diff)
downloadvyos-1x-bebd084651b50171e696af232a9c403f69ac6230.tar.gz
vyos-1x-bebd084651b50171e696af232a9c403f69ac6230.zip
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x: openvpn: bridge: T1556: remove obsolete bridge-group definition ifconfig: T1849: fix DHCPv6 startup Python/VyOS validate: T1849: handle is_ipv6()/is_ipv6() exceptions ifconfig: T1793: remove dhcpv6 client debug output ddclient: T1853: bugfix TypeError exception syslog: T1845: syslog host no longer accepts a port syslog: code formatting syslog: T1845: syslog host no longer accepts a port syslog: renaming files and conf script to fit new scheme T1855, T1826: clean up the reboot/shutdown script. wireguard: T1853: disable peer doesn't work Revert "syslog: T1845: syslog host no longer accepts a port" dmvpn: T1784: Add swanctl load call syslog: T1845: syslog host no longer accepts a port [vyos.config] T1847: correctly set_level for path given as empty string
Diffstat (limited to 'python/vyos/config.py')
-rw-r--r--python/vyos/config.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/python/vyos/config.py b/python/vyos/config.py
index 5bd8fb072..c7bd96e2f 100644
--- a/python/vyos/config.py
+++ b/python/vyos/config.py
@@ -160,7 +160,10 @@ class Config(object):
# and path supplied as method argument
# XXX: for small strings in-place concatenation is not a problem
if isinstance(path, str):
- self._level = re.split(r'\s+', path)
+ if path:
+ self._level = re.split(r'\s*', path)
+ else:
+ self._level = []
elif isinstance(path, list):
self._level = path
else: