From e4446b64c12eb4f6aefad91c0997960303693d3a Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Wed, 19 Dec 2007 14:39:14 -0600
Subject: Fixing parseonly with a modified version of jay's patch from #968.

---
 bin/puppet | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bin/puppet')

diff --git a/bin/puppet b/bin/puppet
index 13e99e2a6..055be11c9 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -198,6 +198,8 @@ begin
     # Compile our catalog
     catalog = Puppet::Node::Catalog.find(node)
 
+    exit(0) if Puppet[:parseonly]
+
     # Translate it to a RAL catalog
     catalog = catalog.to_ral
 
-- 
cgit 


From c59ff622a33b82f413207a146edd4ff6e011e729 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Fri, 21 Dec 2007 17:52:06 -0600
Subject: Further fixes toward #965.  Turned out that the previous fix caused
 other problems.

This whole thing will hopefully get *drastically* easier once we
get rid of global resources.
---
 bin/puppet | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bin/puppet')

diff --git a/bin/puppet b/bin/puppet
index 055be11c9..f5d230a7a 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -203,6 +203,8 @@ begin
     # Translate it to a RAL catalog
     catalog = catalog.to_ral
 
+    catalog.finalize
+
     # And apply it
     catalog.apply
 rescue => detail
-- 
cgit