summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2011-03-03 06:57:17 +1100
committerMatt Robinson <matt@puppetlabs.com>2011-03-22 00:33:18 -0700
commit923d613bb5d96b1898a718bc37842531124b9b89 (patch)
tree78e1332dbe1cd5edf7e18cae12145bf51e2b2053 /lib/puppet/application
parent66a4f361502864e8ea6ca3a11181851b7c313664 (diff)
downloadpuppet-923d613bb5d96b1898a718bc37842531124b9b89.tar.gz
puppet-923d613bb5d96b1898a718bc37842531124b9b89.tar.xz
puppet-923d613bb5d96b1898a718bc37842531124b9b89.zip
Fixed #6555 - Ruby 1.9.x returning Invalid next (SyntaxError)
The kick application has the option to ping hosts. On 1.9.x this code was returning "Invalid next". The next in this code has been replaced with an exit. Testing has confirmed this doesn't change the behavior of puppet kick.
Diffstat (limited to 'lib/puppet/application')
-rw-r--r--lib/puppet/application/kick.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/application/kick.rb b/lib/puppet/application/kick.rb
index 604132818..da93c0182 100644
--- a/lib/puppet/application/kick.rb
+++ b/lib/puppet/application/kick.rb
@@ -245,7 +245,7 @@ License
out = %x{ping -c 1 #{host}}
unless $CHILD_STATUS == 0
$stderr.print "Could not contact #{host}\n"
- next
+ exit($CHILD_STATUS)
end
end