diff options
| author | hagbard <vyosdev@derith.de> | 2018-08-25 10:17:31 -0700 |
|---|---|---|
| committer | hagbard <vyosdev@derith.de> | 2018-08-25 10:17:31 -0700 |
| commit | 2c6e9b40b41947dcd5de00d9912c9f531b70e8fa (patch) | |
| tree | bde6a97b076dcc3b5266dcf4965b6cecb5ac481e | |
| parent | 81aaced26db8becb1ced9610b7399d870af70f2f (diff) | |
| parent | bbc698be2fcafad4e803fc01ec89f44a3aa20782 (diff) | |
| download | vyos-1x-2c6e9b40b41947dcd5de00d9912c9f531b70e8fa.tar.gz vyos-1x-2c6e9b40b41947dcd5de00d9912c9f531b70e8fa.zip | |
Merge remote-tracking branch 'upstream/current' into current
| -rwxr-xr-x | src/conf_mode/ntp.py | 2 | ||||
| -rwxr-xr-x | src/helpers/validate-value.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/ntp.py b/src/conf_mode/ntp.py index 2a6088575..b618cbd89 100755 --- a/src/conf_mode/ntp.py +++ b/src/conf_mode/ntp.py @@ -156,7 +156,7 @@ def apply(ntp): if ntp is not None: os.system('sudo /usr/sbin/invoke-rc.d ntp force-reload') else: - # NTP suuport is removed in the commit + # NTP support is removed in the commit os.system('sudo /usr/sbin/invoke-rc.d ntp stop') os.unlink(config_file) diff --git a/src/helpers/validate-value.py b/src/helpers/validate-value.py index d702739b5..36f996d38 100755 --- a/src/helpers/validate-value.py +++ b/src/helpers/validate-value.py @@ -23,7 +23,7 @@ try: except Exception as exn: if debug: print(exn) - else: + else: pass try: |