diff options
| author | Rick Bradley <rick@rickbradley.com> | 2007-10-09 11:29:13 -0500 |
|---|---|---|
| committer | Rick Bradley <rick@rickbradley.com> | 2007-10-09 11:29:13 -0500 |
| commit | fdfe807bd986a2b27f0dfd0cecde1a33aeee309b (patch) | |
| tree | 0b6375bdefa041a7d4fbab9745ed084fb025bc30 /lib/puppet/indirector/code | |
| parent | 42b98562b5237797e1a51fdcdd57aa3c6825b404 (diff) | |
| parent | 01f132d8b88467dfd314ad355f1cdf9f546945b3 (diff) | |
| download | puppet-fdfe807bd986a2b27f0dfd0cecde1a33aeee309b.tar.gz puppet-fdfe807bd986a2b27f0dfd0cecde1a33aeee309b.tar.xz puppet-fdfe807bd986a2b27f0dfd0cecde1a33aeee309b.zip | |
Merge branch 'master' of git://reductivelabs.com/puppet into routing
Diffstat (limited to 'lib/puppet/indirector/code')
| -rw-r--r-- | lib/puppet/indirector/code/configuration.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/puppet/indirector/code/configuration.rb b/lib/puppet/indirector/code/configuration.rb index 2d8fedcc8..949926a3c 100644 --- a/lib/puppet/indirector/code/configuration.rb +++ b/lib/puppet/indirector/code/configuration.rb @@ -21,9 +21,13 @@ class Puppet::Indirector::Code::Configuration < Puppet::Indirector::Code node = find_node(key) end - configuration = compile(node) - - return configuration + if configuration = compile(node) + return configuration.to_transportable + else + # This shouldn't actually happen; we should either return + # a config or raise an exception. + return nil + end end def initialize |