summaryrefslogtreecommitdiffstats
path: root/lib/puppet/node.rb
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-07-03 13:02:08 +1000
committerJames Turnbull <james@lovedthanlost.net>2008-07-03 13:02:08 +1000
commit32b65894949151ac48d393fff150ff96474015a8 (patch)
tree0205657287e61e738f17d6a758019fbb588eee81 /lib/puppet/node.rb
parentdaf0d9db5dc400a9795a5f741c8c63184f5e8982 (diff)
parent4b6b22e8d64b6fe8c69d9925eedc703757ce3567 (diff)
downloadpuppet-32b65894949151ac48d393fff150ff96474015a8.tar.gz
puppet-32b65894949151ac48d393fff150ff96474015a8.tar.xz
puppet-32b65894949151ac48d393fff150ff96474015a8.zip
Merge branch 'trivial/0.24.x/nodes' of git://github.com/lak/puppet into 0.24.x
Diffstat (limited to 'lib/puppet/node.rb')
-rw-r--r--lib/puppet/node.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/node.rb b/lib/puppet/node.rb
index 14d0f6ac7..afa18f565 100644
--- a/lib/puppet/node.rb
+++ b/lib/puppet/node.rb
@@ -75,6 +75,8 @@ class Puppet::Node
def fact_merge
if facts = Puppet::Node::Facts.find(name)
merge(facts.values)
+ else
+ Puppet.warning "Could not find facts for %s; you probably have a discrepancy between the node and fact names" % name
end
end