summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-02-14 17:32:13 -0600
committerLuke Kanies <luke@madstop.com>2009-02-18 22:38:42 -0600
commit992231a58daf8f0b489022f0af8ddcfb615bb0e1 (patch)
tree5547bffedf3052eb646eec5b28170f64e1135102 /lib/puppet
parent0304a78c0fe3802e4fb7466c3eac111d45f8eed7 (diff)
downloadpuppet-992231a58daf8f0b489022f0af8ddcfb615bb0e1.tar.gz
puppet-992231a58daf8f0b489022f0af8ddcfb615bb0e1.tar.xz
puppet-992231a58daf8f0b489022f0af8ddcfb615bb0e1.zip
Some small fixes to provide better debugging and load a library
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/transaction.rb1
-rw-r--r--lib/puppet/type/file.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index 30f86a9d7..cb17de7b9 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -338,6 +338,7 @@ class Transaction
begin
made = resource.send(method)
rescue => detail
+ puts detail.backtrace if Puppet[:trace]
resource.err "Failed to generate additional resources using '%s': %s" % [method, detail]
end
return [] unless made
diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb
index 3d721ac69..7b2de7aaf 100644
--- a/lib/puppet/type/file.rb
+++ b/lib/puppet/type/file.rb
@@ -6,6 +6,7 @@ require 'fileutils'
require 'puppet/network/handler'
require 'puppet/util/diff'
require 'puppet/util/checksums'
+require 'puppet/network/client'
module Puppet
newtype(:file) do