Merge pull request #7622 from rmt/develop

Fix boolean logic so verify_env has meaning
This commit is contained in:
Thomas S Hatch 2013-10-06 10:12:00 -07:00
commit d05b22fd92

View File

@ -39,9 +39,9 @@ class SaltCMD(parsers.SaltCMDOptionParser):
self.parse_args()
if self.config['verify_env']:
if (not self.config['log_file'].startswith('tcp://') or
not self.config['log_file'].startswith('udp://') or
not self.config['log_file'].startswith('file://')):
if not (self.config['log_file'].startswith('tcp://') or
self.config['log_file'].startswith('udp://') or
self.config['log_file'].startswith('file://')):
# Logfile is not using Syslog, verify
verify_files(
[self.config['log_file']],