Multiple environment support now works, and I have even tested it in real life. This commit is mostly a bug-fix commit, resulting from the difference between real-life testing and unit testing.

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/puppet/network/handler/configuration.rb b/lib/puppet/network/handler/configuration.rb
index fd1ee86ed..b2b16d022 100644
--- a/lib/puppet/network/handler/configuration.rb
+++ b/lib/puppet/network/handler/configuration.rb
@@ -92,6 +92,10 @@ class Puppet::Network::Handler
             end
 
             # Ask the interpreter to compile the configuration.
+            str = "Compiled configuration for %s" % node.name
+            if node.environment
+                str += " in environment %s" % node.environment
+            end
             config = nil
             benchmark(level, "Compiled configuration for %s" % node.name) do
                 begin
@@ -117,8 +121,8 @@ class Puppet::Network::Handler
             # Allow specification of a code snippet or of a file
             if code = options[:Code]
                 args[:Code] = code
-            else
-                args[:Manifest] = options[:Manifest] || Puppet[:manifest]
+            elsif options[:Manifest]
+                args[:Manifest] = options[:Manifest]
             end
 
             args[:Local] = local?