From eba23ee53d1e0f4743237516b976f78dc0a671fb Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Mon, 18 Nov 2013 20:29:17 -0600 Subject: [PATCH] Updated to bugfix release 0.17.2 --- .gitignore | 2 ++ salt-minion | 8 ++++---- salt.spec | 7 +++++-- sources | 4 ++-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ead93fd..00244a4 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ /salt-0.17.0.tar.gz /SaltTesting-0.5.1.tar.gz /salt-0.17.1.tar.gz +/salt-0.17.2.tar.gz +/SaltTesting-0.5.3.tar.gz diff --git a/salt-minion b/salt-minion index 2ef39c9..e8cd25f 100644 --- a/salt-minion +++ b/salt-minion @@ -65,13 +65,13 @@ start() { fi else if [ $(pidofproc $PROCESS) ]; then - RETVAL=$? - echo -n "already running" + RETVAL=$? + echo -n "already running" else - daemon --check $SERVICE $SALTMINION -d $MINION_ARGS - RETVAL=$? + daemon --check $SERVICE $SALTMINION -d $MINION_ARGS fi fi + RETVAL=$? echo return $RETVAL } diff --git a/salt.spec b/salt.spec index 4dfc913..f928d14 100644 --- a/salt.spec +++ b/salt.spec @@ -12,10 +12,10 @@ %{!?pythonpath: %global pythonpath %(%{__python} -c "import os, sys; print(os.pathsep.join(x for x in sys.path if x))")} %define _salttesting SaltTesting -%define _salttesting_ver 0.5.1 +%define _salttesting_ver 0.5.3 Name: salt -Version: 0.17.1 +Version: 0.17.2 Release: 1%{?dist} Summary: A parallel remote execution system @@ -319,6 +319,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Nov 18 2013 Erik Johnson - 0.17.2-1 +- Update to bugfix release 0.17.2 + * Thu Oct 17 2013 Erik Johnson - 0.17.1-1 - Update to bugfix release 0.17.1 diff --git a/sources b/sources index acd2b31..9c35745 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -234eb968862f54f58ccd7b7ea2e3b3d9 salt-0.17.1.tar.gz -f4a6a5d590a2855b89060682117fb69e SaltTesting-0.5.1.tar.gz +cb61ca768847c2f4d0844fef651a89d1 salt-0.17.2.tar.gz +75b1fdd52e8ffd9368109ac2d7b5f57c SaltTesting-0.5.3.tar.gz