Revert unintended changes to the debian/ubuntu init scripts and bump the release number
Signed-off-by: R.I.Pienaar <[email protected]> --- Local-branch: bug/master/7420 Rakefile | 2 +- mcollective.init | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Rakefile b/Rakefile index e5f9ce7..805f1cd 100644 --- a/Rakefile +++ b/Rakefile @@ -7,7 +7,7 @@ require 'find' PROJ_DOC_TITLE = "The Marionette Collective" PROJ_VERSION = "1.2.0" -PROJ_RELEASE = "5" +PROJ_RELEASE = "6" PROJ_NAME = "mcollective" PROJ_RPM_NAMES = [PROJ_NAME] PROJ_FILES = ["#{PROJ_NAME}.spec", "#{PROJ_NAME}.init", "#{PROJ_NAME}.init-rh", "mcollectived.rb", "COPYING", "doc", "etc", "lib", "plugins", "ext", "mco"] diff --git a/mcollective.init b/mcollective.init index 4187e58..cb4de7d 100755 --- a/mcollective.init +++ b/mcollective.init @@ -66,13 +66,11 @@ case "$1" in ${mcollectived} --pid=${pidfile} --config="/etc/mcollective/server.cfg" if [ $? = 0 ]; then - success $"mcollectived" + log_success_msg touch $lock - echo exit 0 else - failure - echo + log_failure_msg exit 1 fi ;; -- 1.7.1 -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
