Merge pull request #4076 from torhve/develop

Use a default for multiprocessing if not set. This fixes #4075
This commit is contained in:
Thomas S Hatch 2013-03-12 18:41:37 -07:00
commit dc2f0f3c19

View File

@ -188,7 +188,7 @@ def daemonize_if(opts, **kwargs):
''' '''
if 'salt-call' in sys.argv[0]: if 'salt-call' in sys.argv[0]:
return return
if not opts['multiprocessing']: if not opts.get('multiprocessing', True):
return return
if sys.platform.startswith('win'): if sys.platform.startswith('win'):
return return