diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-05-19 10:29:51 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-05-19 10:46:51 -0700 |
| commit | 3682025065c431c750894dd9872f18a1f0b073ab (patch) | |
| tree | f6ff6083755b6e3414c86010bd413086f656e8d3 /lib/puppet | |
| parent | fc0add14616f9ddf54ba2dd449bfd0acc03d7ed7 (diff) | |
| download | puppet-3682025065c431c750894dd9872f18a1f0b073ab.tar.gz puppet-3682025065c431c750894dd9872f18a1f0b073ab.tar.xz puppet-3682025065c431c750894dd9872f18a1f0b073ab.zip | |
maint: move trap call to Signal so we can stub it for specs
Also removed some monkey patching on Signal that would have
theoretically done this without having to explicitly call trap on Signal
in order to stub it, but it's not working.
This allows us to ctrl+c (send SIGINT) in the middle of a spec run.
Paired-with: Josh Cooper <josh@puppetlabs.com>
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/application/device.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/application/device.rb b/lib/puppet/application/device.rb index df5bac26a..3e2dec98c 100644 --- a/lib/puppet/application/device.rb +++ b/lib/puppet/application/device.rb @@ -11,7 +11,7 @@ class Puppet::Application::Device < Puppet::Application def preinit # Do an initial trap, so that cancels don't get a stack trace. - trap(:INT) do + Signal.trap(:INT) do $stderr.puts "Cancelling startup" exit(0) end |