summaryrefslogtreecommitdiffstats
path: root/lib/puppet/node/catalog.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-04-01 00:08:15 -0500
committerLuke Kanies <luke@madstop.com>2008-04-01 00:08:15 -0500
commit5e78151d1736e2c4cb741c2cbb7c6b5a59ed3e13 (patch)
tree428a352bd3e8d4153e798ffdba390d02b5d63d68 /lib/puppet/node/catalog.rb
parent88dc49cb7b0efe757c92ce28c807b91335acb07a (diff)
downloadpuppet-5e78151d1736e2c4cb741c2cbb7c6b5a59ed3e13.tar.gz
puppet-5e78151d1736e2c4cb741c2cbb7c6b5a59ed3e13.tar.xz
puppet-5e78151d1736e2c4cb741c2cbb7c6b5a59ed3e13.zip
Fixing tests that were failing as a result of the merge,
including removing some now-obsolete code and tests from the Settings class.
Diffstat (limited to 'lib/puppet/node/catalog.rb')
-rw-r--r--lib/puppet/node/catalog.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb
index 77e845368..c5e32a032 100644
--- a/lib/puppet/node/catalog.rb
+++ b/lib/puppet/node/catalog.rb
@@ -61,7 +61,7 @@ class Puppet::Node::Catalog < Puppet::PGraph
def add_resource(*resources)
resources.each do |resource|
unless resource.respond_to?(:ref)
- raise ArgumentError, "Can only add objects that respond to :ref"
+ raise ArgumentError, "Can only add objects that respond to :ref, not instances of %s" % resource.class
end
fail_unless_unique(resource)