Merge pull request saltstack#18770 from basepi/publish-prevent-fulldata

basepi · basepi · commit 7097cfd4dcf0 · 2014-12-08T10:14:17.000-07:00
[2014.7] Prevent all `publish.` calls from publish calls
diff --git a/salt/modules/publish.py b/salt/modules/publish.py
@@ -51,8 +51,8 @@ def _publish(
 
         salt system.example.com publish.publish '*' cmd.run 'ls -la /tmp'
     '''
-    if fun == 'publish.publish':
-        log.info('Function name is \'publish.publish\'. Returning {}')
+    if fun.startswith('publish.'):
+        log.info('Cannot publish publish calls. Returning {}')
         return {}
 
     arg = [salt.utils.args.yamlify_arg(arg)]
