diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/application/device.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/type/file.rb | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb index 1790c5e92..72e9a9495 100644 --- a/lib/puppet/type/file.rb +++ b/lib/puppet/type/file.rb @@ -264,7 +264,7 @@ Puppet::Type.newtype(:file) do parents = [] until basedir == parents.last parents << basedir - basedir = File.dirname(basedir) + basedir = ::File.dirname(basedir) end # The filename of the first ancestor found, or nil parents.find { |dir| catalog.resource(:file, dir) } |