diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-05-23 23:16:51 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-05-23 23:16:51 -0700 |
| commit | 7f826bfc1352ef84b2e990874c6285c5aca66bac (patch) | |
| tree | bf2d11a0bf96d4372ecb1daaa51f6f7a354800c0 /lib/puppet | |
| parent | 25b967559dfa39eb094008c7a3952c4ee885530b (diff) | |
| parent | e0b63a27382b577ce8af497238f702193ad15795 (diff) | |
| download | puppet-7f826bfc1352ef84b2e990874c6285c5aca66bac.tar.gz puppet-7f826bfc1352ef84b2e990874c6285c5aca66bac.tar.xz puppet-7f826bfc1352ef84b2e990874c6285c5aca66bac.zip | |
Merge branch '2.7.x'
* 2.7.x:
(#7502) Fixed parser spec for ruby 1.8.5
(#7507) Add more 1.9 filters
(#6395) Add extpuppet help, eval, and interfaces
maint: move trap call to Signal so we can stub it for specs
Updated CHANGELOG for 2.7.0rc3
(#7259) Remove ActiveRecord requirement from indirector face spec
(#7259) Do not try to load all Terminus classes when configuring the Indirector
Adding a sleep state post starting master
Diffstat (limited to 'lib/puppet')
| -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) } |