Merge pull request #3815 from mrtizmo/develop

Fixes and doc updates.
This commit is contained in:
Thomas S Hatch 2013-02-20 22:46:37 -08:00
commit 8caa9c56cc

View File

@ -51,6 +51,10 @@ def set_file(name, source):
debconf.set_file:
- source: salt://pathto/pkg.selections
<state_id>:
debconf.set_file:
- source: salt://pathto/pkg.selections?env=myenvironment
source:
The location of the file containing the package selections
'''
@ -61,10 +65,10 @@ def set_file(name, source):
if __opts__['test']:
ret['result'] = None
ret['comment'] = 'Debconf selections were set.'
ret['comment'] = 'Debconf selections would have been set.'
return ret
if __salt__['debconfmod.set_file'](source):
if __salt__['debconf.set_file'](source):
ret['comment'] = 'Debconf selections were set.'
else:
ret['result'] = False