diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:25:12 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:25:12 +0100 |
| commit | 75847af961fd61daa63b26e8bafb1237df85a7fb (patch) | |
| tree | 63deca295e8b843518cde30cadc2f1df15c6d273 /python | |
| parent | 60e61ed1247c4f8efdd1805b1e1f2dda5ed2472c (diff) | |
| parent | 214e63fbad5f1ed008543ba0eec56d1aa6649745 (diff) | |
| download | vyos-1x-75847af961fd61daa63b26e8bafb1237df85a7fb.tar.gz vyos-1x-75847af961fd61daa63b26e8bafb1237df85a7fb.zip | |
Merge branch 'equuleus' of github.com:vyos/vyos-1x into currentvyos/1.3dev0
* 'equuleus' of github.com:vyos/vyos-1x:
T1873: DHCP: add current year to copyright notice
T1873: DHCP: fix service name in op-mode "show dhcp"
T1873: DHCP: ship our own server init scripts
vyos.config: T1862: restore regex after merge
equuleus: T1862: Use regex pattern \s+ to split strings on whitespace
[vyos.config] T1758: adjust regex for change in Python 3.7
Jenkins: Docker: always pull container from Dockerhub
ssh - T1719: ssh deprecated options removed
Jenkins: assume dependencies are available in Docker container
Jenkins: fix httpURI in isCustomBuild()
openvpn: T1617: bugfix for server push-route
openvpn: T1548: remove authy 2fa provider
update Jenkins file for equuleus
igmpproxy: remove init script which is already provided by Debian Buster
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/config.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/vyos/config.py b/python/vyos/config.py index 27422786e..6aed8693c 100644 --- a/python/vyos/config.py +++ b/python/vyos/config.py @@ -126,7 +126,7 @@ class Config(object): # It may cause problems with exists() when it's used for checking values, # since values may contain whitespace. if isinstance(path, str): - path = re.split(r'\s*', path) + path = re.split(r'\s+', path) elif isinstance(path, list): pass else: @@ -161,7 +161,7 @@ class Config(object): # XXX: for small strings in-place concatenation is not a problem if isinstance(path, str): if path: - self._level = re.split(r'\s*', path) + self._level = re.split(r'\s+', path) else: self._level = [] elif isinstance(path, list): @@ -195,7 +195,7 @@ class Config(object): # libvyosconfig exists() works only for _nodes_, not _values_ # libvyattacfg one also worked for values, so we emulate that case here if isinstance(path, str): - path = re.split(r'\s*', path) + path = re.split(r'\s+', path) path_without_value = path[:-1] path_str = " ".join(path_without_value) try: |