summaryrefslogtreecommitdiffstats
path: root/lib/puppet/transportable.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-09-15 02:01:58 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-09-15 02:01:58 +0000
commit2c57173a737bcdf12e6f3481a50e2788f5d1b4e3 (patch)
tree3641b27d4cefe2f1d123faa1b8d5f65a8d5f497f /lib/puppet/transportable.rb
parent16d9d6fe69d6eb01f7655c760d54de5986e2b3f1 (diff)
downloadpuppet-2c57173a737bcdf12e6f3481a50e2788f5d1b4e3.tar.gz
puppet-2c57173a737bcdf12e6f3481a50e2788f5d1b4e3.tar.xz
puppet-2c57173a737bcdf12e6f3481a50e2788f5d1b4e3.zip
Raising element creation errors up outside the "create" method, so that tests can more easily tell when an object is invalid.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1597 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/transportable.rb')
-rw-r--r--lib/puppet/transportable.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/puppet/transportable.rb b/lib/puppet/transportable.rb
index 0d775f7e0..90bc70fc2 100644
--- a/lib/puppet/transportable.rb
+++ b/lib/puppet/transportable.rb
@@ -264,9 +264,11 @@ module Puppet
end
# Now just call to_type on them with the container as a parent
- unless obj = child.to_type(container)
- # nothing; we assume the method already warned
- #Puppet.warning "Could not create child %s" % child.name
+ begin
+ child.to_type(container)
+ rescue => detail
+ # We don't do anything on failures, since we assume it's
+ # been logged elsewhere.
end
}