diff options
| author | Luke Kanies <luke@madstop.com> | 2009-02-06 17:52:34 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2009-02-06 18:08:44 -0600 |
| commit | 53357884111d3499746b292f99948d5eb3c83415 (patch) | |
| tree | 063ea361e228b5bf711a3b96ef2faa84bb74fce0 /bin | |
| parent | 08a5d492dd3545366a2850d568d87aad0ba884e6 (diff) | |
| download | puppet-53357884111d3499746b292f99948d5eb3c83415.tar.gz puppet-53357884111d3499746b292f99948d5eb3c83415.tar.xz puppet-53357884111d3499746b292f99948d5eb3c83415.zip | |
Fixing tests broken during the #1405 fix.
Most of these were small changes, like moved methods.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/filebucket | 5 | ||||
| -rwxr-xr-x | bin/puppet | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/bin/filebucket b/bin/filebucket index 17e01ed64..ea75cb6de 100755 --- a/bin/filebucket +++ b/bin/filebucket @@ -152,7 +152,10 @@ Puppet::Log.newdestination(:console) client = nil server = nil -Puppet.settraps +trap(:INT) do + $stderr.puts "Cancelling" + exit(1) +end if options[:debug] Puppet::Log.level = :debug diff --git a/bin/puppet b/bin/puppet index c01d7392c..e3a9c4f37 100755 --- a/bin/puppet +++ b/bin/puppet @@ -166,7 +166,10 @@ end client = nil server = nil -Puppet.settraps +trap(:INT) do + $stderr.puts "Exiting" + exit(1) +end if options[:debug] Puppet::Util::Log.level = :debug |