Merge pull request #19555 from cachedout/check_cwd

Check cwd before running saltcmd
This commit is contained in:
Mike Place 2015-01-08 17:04:28 -07:00
commit 783de9584a

View File

@ -1458,6 +1458,10 @@ class SaltCMDOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
_default_logging_level_ = 'warning' _default_logging_level_ = 'warning'
_default_logging_logfile_ = os.path.join(syspaths.LOGS_DIR, 'master') _default_logging_logfile_ = os.path.join(syspaths.LOGS_DIR, 'master')
_loglevel_config_setting_name_ = 'cli_salt_log_file' _loglevel_config_setting_name_ = 'cli_salt_log_file'
try:
os.getcwd()
except OSError:
sys.exit("Cannot access current working directory. Exiting!")
def _mixin_setup(self): def _mixin_setup(self):
self.add_option( self.add_option(