Fixing #326 -- parseonly now just creates a simple Master without opening a port

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

1 files changed, 13 insertions, 5 deletions

diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index ec47075f8..cf3b42cff 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -227,6 +227,19 @@ if options[:havebucket]
     handlers[:FileBucket] = bucket
 end
 
+if Puppet[:parseonly]
+    begin
+        Puppet::Server::Master.new(master)
+    rescue => detail
+        if Puppet[:trace]
+            puts detail.backtrace
+        end
+        $stderr.puts detail
+    end
+    # we would have already exited if the file weren't syntactically correct
+    exit(0)
+end
+
 if File.exists?(Puppet[:fileserverconfig])
     fs[:Config] = Puppet[:fileserverconfig]
 #else
@@ -264,11 +277,6 @@ if Process.uid == 0
     end
 end
 
-if Puppet[:parseonly]
-    # we would have already exited if the file weren't syntactically correct
-    exit(0)
-end
-
 Puppet.newservice(server)
 Puppet.settraps