Merge /opt/rl/git/puppet

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2773 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index 9da1928b3..3ba9c0c7a 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -480,9 +480,14 @@ class Puppet::Parser::Interpreter
     # Look for external node definitions.
     def nodesearch_external(name)
         return nil unless Puppet[:external_nodes] != "none"
-        
+  
+        # This is a very cheap way to do this, since it will break on
+        # commands that have spaces in the arguments.  But it's good
+        # enough for most cases.
+        external_node_command = Puppet[:external_nodes].split
+        external_node_command << name
         begin
-            output = Puppet::Util.execute([Puppet[:external_nodes], name])
+            output = Puppet::Util.execute(external_node_command)
         rescue Puppet::ExecutionFailure => detail
             if $?.exitstatus == 1
                 return nil