Update for Salt 2018.3.0 point release

.gitignore

@@ -78,3 +78,4 @@
 /salt-2017.7.3.tar.gz
 /salt-2017.7.4.tar.gz
 /salt-2017.7.5.tar.gz
+/salt-2018.3.0.tar.gz

salt-minion

@@ -85,6 +85,7 @@ _get_salt_config_value() {
             \"$SALTCALL\" \
             -c \"$CONFIG_DIR\" \
             --no-color \
+            --skip-grains \
             --local config.get \
             \"$1\" \
         " \

salt.bash

@@ -48,10 +48,10 @@ _salt(){
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
     if [ ${COMP_CWORD} -gt 2 ]; then
-	pprev="${COMP_WORDS[COMP_CWORD-2]}"
+        pprev="${COMP_WORDS[COMP_CWORD-2]}"
     fi
     if [ ${COMP_CWORD} -gt 3 ]; then
-	ppprev="${COMP_WORDS[COMP_CWORD-3]}"
+        ppprev="${COMP_WORDS[COMP_CWORD-3]}"
     fi
 
     opts="-h --help -d --doc --documentation --version --versions-report -c \
@@ -71,7 +71,7 @@ _salt(){
     case "${pprev}" in
     -G|--grain|--grain-pcre)
     if [ "${cur}" = ":" ]; then
-        COMPREPLY=($(compgen -W "`_salt_get_grain_values ${prev}`"  ))	
+        COMPREPLY=($(compgen -W "`_salt_get_grain_values ${prev}`"))
         return 0
     fi
     ;;
@@ -109,7 +109,7 @@ _salt(){
      -G|--grain|--grain-pcre)
         COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur}))
         return 0
-	;;
+        ;;
      -C|--compound)
         COMPREPLY=() # TODO: finish this one? how?
         return 0
@@ -123,7 +123,7 @@ _salt(){
         return 0
         ;;
      -N|--nodegroup)
-	    MASTER_CONFIG='/etc/salt/master'
+        MASTER_CONFIG='/etc/salt/master'
         COMPREPLY=($(compgen -W "`awk -F ':'  'BEGIN {print_line = 0};  /^nodegroups/ {print_line = 1;getline } print_line && /^  */ {print $1} /^[^ ]/ {print_line = 0}' <${MASTER_CONFIG}`" -- ${cur}))
         return 0
      ;;
@@ -222,7 +222,7 @@ _saltkey(){
         return 0
      ;;
      --accept-all)
-	return 0
+        return 0
      ;;
     esac
     COMPREPLY=($(compgen -W "${opts} " -- ${cur}))
@@ -261,19 +261,19 @@ _saltcall(){
     case ${prev} in
         -m|--module-dirs)
                 COMPREPLY=( $(compgen -d ${cur} ))
-		return 0
- 	 	;;
-	-l|--log-level)
-		COMPREPLY=( $(compgen -W "info none garbage trace warning error debug" -- ${cur}))
-		return 0
-		;;
-	-g|grains)
                 return 0
-		;;
+                ;;
-	salt-call)
+        -l|--log-level)
+                COMPREPLY=( $(compgen -W "info none garbage trace warning error debug" -- ${cur}))
+                return 0
+                ;;
+        -g|grains)
+                return 0
+                ;;
+        salt-call)
                 COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
-	        return 0
+                return 0
-		;;
+                ;;
     esac
 
     _salt_coms="$(salt-call --out=txt -- sys.list_functions|sed 's/^.*\[//' | tr -d ",']"  )"
@@ -308,46 +308,45 @@ _saltcp(){
     fi
 
     case ${prev} in
- 	salt-cp)
+        salt-cp)
-	    COMPREPLY=($(compgen -W "${opts} $(_salt_get_keys acc)" -- ${cur}))
+            COMPREPLY=($(compgen -W "${opts} $(_salt_get_keys acc)" -- ${cur}))
-	    return 0
+            return 0
-	;;
+            ;;
         -t|--timeout)
-	    # those numbers are just a hint
+            # those numbers are just a hint
             COMPREPLY=($(compgen -W "2 3 4 8 10 15 20 25 30 40 60 90 120 180 240 300" -- ${cur} ))
-	    return 0
+            return 0
-        ;;
+            ;;
-	-E|--pcre)
+    -E|--pcre)
             COMPREPLY=($(compgen -W "$(_salt_get_keys acc)" -- ${cur}))
             return 0
-	;;
+            ;;
-	-L|--list)
+    -L|--list)
-	    # IMPROVEMENTS ARE WELCOME
+            # IMPROVEMENTS ARE WELCOME
-	    prefpart="${cur%,*},"
+            prefpart="${cur%,*},"
-	    postpart=${cur##*,}
+            postpart=${cur##*,}
-	    filt="^\($(echo ${cur}| sed 's:,:\\|:g')\)$"
+            filt="^\($(echo ${cur}| sed 's:,:\\|:g')\)$"
             helper=($(_salt_get_keys acc | grep -v "${filt}" | sed "s/^/${prefpart}/"))
-	    COMPREPLY=($(compgen -W "${helper[*]}" -- ${cur}))
+            COMPREPLY=($(compgen -W "${helper[*]}" -- ${cur}))
-
+            return 0
-	    return 0
+            ;;
-	;;
+    -G|--grain|--grain-pcre)
-	-G|--grain|--grain-pcre)
             COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur}))
             return 0
-	    ;;
+            ;;
-	    # FIXME
+    # FIXME
-	-R|--range)
+    -R|--range)
-	    # FIXME ??
+            # FIXME ??
-	    return 0
+            return 0
-	;;
+            ;;
-	-C|--compound)
+    -C|--compound)
-	    # FIXME ??
+            # FIXME ??
-	    return 0
+            return 0
-	;;
+            ;;
-	-c|--config)
+    -c|--config)
-	    COMPREPLY=($(compgen -f -- ${cur}))
+            COMPREPLY=($(compgen -f -- ${cur}))
-	    return 0
+            return 0
-	;;
+            ;;
     esac
 
    # default is using opts:

salt.spec

@@ -41,7 +41,7 @@
 %define fish_dir %{_datadir}/fish/vendor_functions.d
 
 Name: salt
-Version: 2017.7.5%{?__rc_ver}
+Version: 2018.3.0%{?__rc_ver}
 Release: 1%{?dist}
 Summary: A parallel remote execution system
 
@@ -626,8 +626,11 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri Mar 30 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2018.3.0-1
+- Update to feature release 2018.3.0-1
+
 * Tue Mar 27 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2017.7.5-1
-- Update to feature release 2017.7.5-1  for Python 2
+- Update to feature release 2017.7.5-1
 
 * Fri Feb 16 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2017.7.4-1
 - Update to feature release 2017.7.4-1

sources

@@ -1 +1 @@
-SHA512 (salt-2017.7.5.tar.gz) = 684ffde7d98c73349b386c94de3d9fc09631a78c5d74e37e6dfd90fbb0c94decc529f56b1eba1559ce9932b16083f88e6495ff6cdf071b32a23028e9db47cc3d
+SHA512 (salt-2018.3.0.tar.gz) = 3d64a4d12d4ff7effe644b682b138d8f49fd00523e9cfe3e80bebff9c944a089fb41cbac92e63139633425f49c1eebeb99145290a0bdd1b4f306da86abe9b2e5