Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Gareth J. Greenaway 2013-11-14 09:41:39 -08:00
commit db37efb8e5

View File

@ -29,7 +29,7 @@ log = logging.getLogger(__name__)
def __virtual__():
if __grains__.get('os', '') == 'FreeBSD' and 'ports.install':
if __grains__.get('os', '') == 'FreeBSD' and 'ports.install' in __salt__:
return 'ports'
return False