Merge pull request #42575 from rallytime/merge-2017.7.1-into-2017.7

[2017.7] Merge forward from 2017.7.1 to 2017.7

doc/topics/releases/2017.7.1.rst

@@ -5,7 +5,7 @@ Salt 2017.7.1 Release Notes
 Version 2017.7.1 is a bugfix release for :ref:`2017.7.0 <release-2017-7-0>`.
 
 Changes for v2017.7.0..v2017.7.1
-------------------------------
+--------------------------------
 
 Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
 

salt/modules/pacman.py

@@ -579,33 +579,33 @@ def install(name=None,
                         '\'{1}\''.format(version_num, name)
                     )
 
-    if wildcards:
-        # Resolve wildcard matches
-        _available = list_repo_pkgs(*[x[0] for x in wildcards], refresh=refresh)
-        for pkgname, verstr in wildcards:
-            candidates = _available.get(pkgname, [])
-            match = salt.utils.fnmatch_multiple(candidates, verstr)
-            if match is not None:
-                targets.append('='.join((pkgname, match)))
-            else:
-                errors.append(
-                    'No version matching \'{0}\' found for package \'{1}\' '
-                    '(available: {2})'.format(
-                        verstr,
-                        pkgname,
-                        ', '.join(candidates) if candidates else 'none'
+        if wildcards:
+            # Resolve wildcard matches
+            _available = list_repo_pkgs(*[x[0] for x in wildcards], refresh=refresh)
+            for pkgname, verstr in wildcards:
+                candidates = _available.get(pkgname, [])
+                match = salt.utils.fnmatch_multiple(candidates, verstr)
+                if match is not None:
+                    targets.append('='.join((pkgname, match)))
+                else:
+                    errors.append(
+                        'No version matching \'{0}\' found for package \'{1}\' '
+                        '(available: {2})'.format(
+                            verstr,
+                            pkgname,
+                            ', '.join(candidates) if candidates else 'none'
+                        )
                     )
-                )
 
-        if refresh:
-            try:
-                # Prevent a second refresh when we run the install command
-                cmd.remove('-y')
-            except ValueError:
-                # Shouldn't happen since we only add -y when refresh is True,
-                # but just in case that code above is inadvertently changed,
-                # don't let this result in a traceback.
-                pass
+            if refresh:
+                try:
+                    # Prevent a second refresh when we run the install command
+                    cmd.remove('-y')
+                except ValueError:
+                    # Shouldn't happen since we only add -y when refresh is True,
+                    # but just in case that code above is inadvertently changed,
+                    # don't let this result in a traceback.
+                    pass
 
     if not errors:
         cmd.extend(targets)

salt/state.py

@@ -577,8 +577,6 @@ class Compiler(object):
                 if '__env__' in body:
                     chunk['__env__'] = body['__env__']
                 chunk['__id__'] = name
-                chunk['arg'] = []
-                chunk['kwarg'] = {}
                 for arg in run:
                     if isinstance(arg, six.string_types):
                         funcs.add(arg)
@@ -591,7 +589,7 @@ class Compiler(object):
                                         names.append(_name)
                                 continue
                             else:
-                                chunk['kwarg'].update(arg)
+                                chunk.update(arg)
                 if names:
                     name_order = 1
                     for entry in names:

salt/utils/reactor.py

@@ -273,6 +273,8 @@ class ReactWrap(object):
         try:
             f_call = salt.utils.format_call(l_fun, low)
             kwargs = f_call.get('kwargs', {})
+            if 'kwarg' not in kwargs:
+                kwargs['kwarg'] = {}
 
             # TODO: Setting the user doesn't seem to work for actual remote publishes
             if low['state'] in ('runner', 'wheel'):