diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-05-19 10:47:07 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-05-19 10:47:07 -0700 |
| commit | be2f20899d76621db4cf574d074f0ae89777272e (patch) | |
| tree | f6ff6083755b6e3414c86010bd413086f656e8d3 /lib | |
| parent | fc0add14616f9ddf54ba2dd449bfd0acc03d7ed7 (diff) | |
| parent | 3682025065c431c750894dd9872f18a1f0b073ab (diff) | |
| download | puppet-be2f20899d76621db4cf574d074f0ae89777272e.tar.gz puppet-be2f20899d76621db4cf574d074f0ae89777272e.tar.xz puppet-be2f20899d76621db4cf574d074f0ae89777272e.zip | |
Merge branch 'ticket/2.7.x/maint-stub_trap' into 2.7.x
* ticket/2.7.x/maint-stub_trap:
maint: move trap call to Signal so we can stub it for specs
Diffstat (limited to 'lib')
| -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 |