diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-11-08 18:37:33 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-11-08 18:37:33 +0100 |
| commit | 8abde544455dd158d080eb6ea7b7ed226b27965a (patch) | |
| tree | 2259e5768e5c71fbf38efccea7e3f0d81d819074 /src/services | |
| parent | 37dcd23368de5872a5d56d356d29cafb1b185ce5 (diff) | |
| parent | cc2ea329b1bb2ac23ffcc64892e831e7978023e2 (diff) | |
| download | vyos-1x-8abde544455dd158d080eb6ea7b7ed226b27965a.tar.gz vyos-1x-8abde544455dd158d080eb6ea7b7ed226b27965a.zip | |
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x:
ddclient: T1789: fix RFC2136 generated config
T1774: fix error output
Python/ifconfig: T1557: do not allow both IPv4 and dhcp address on interfaces
list_interfaces: add wifi interfaces to bridgeable interfaces
Diffstat (limited to 'src/services')
| -rwxr-xr-x | src/services/vyos-http-api-server | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/services/vyos-http-api-server b/src/services/vyos-http-api-server index 571ec1258..1abaed873 100755 --- a/src/services/vyos-http-api-server +++ b/src/services/vyos-http-api-server @@ -221,7 +221,7 @@ def get_value(): elif config_format == 'raw': pass else: - return error(400, "\"{0}\" is not a valid config format") + return error(400, "\"{0}\" is not a valid config format".format(config_format)) else: return error(400, "\"{0}\" is not a valid operation".format(op)) except VyOSError as e: |