From 6e16353c0162302985355cb642298e3bbb2b6061 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Wed, 3 Jul 2019 12:41:33 +0200
Subject: T1497: remove the no longer necessary workaround for bad
return_effective_values output.
---
src/conf_mode/host_name.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py
index c5268df2a..475f68b49 100755
--- a/src/conf_mode/host_name.py
+++ b/src/conf_mode/host_name.py
@@ -117,10 +117,7 @@ def get_config(arguments):
hosts['domain_search'].append(search)
if conf.exists("system name-server"):
- if not isinstance(conf.return_values("system name-server"), list):
- hosts['nameserver'] = conf.return_values("system name-server").replace("'", "").split()
- else:
- hosts['nameserver'] = conf.return_values("system name-server")
+ hosts['nameserver'] = conf.return_values("system name-server")
hosts['no_dhcp_ns'] = conf.exists('system disable-dhcp-nameservers')
--
cgit v1.2.3