Merge branch '0.24.x'

Conflicts:

	CHANGELOG
	man/man8/puppet.8

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index c3279d4e7..e27a209fc 100644
--- a/lib/puppet/parser/parser.rb
+++ b/lib/puppet/parser/parser.rb
@@ -29,7 +29,7 @@ module Puppet
 
     class Parser < Racc::Parser
 
-module_eval <<'..end grammar.ra modeval..id9134b179f4', 'grammar.ra', 638
+module_eval <<'..end grammar.ra modeval..idfef5d70c9f', 'grammar.ra', 638
 
 # It got too annoying having code in a file that needs to be compiled.
 require 'puppet/parser/parser_support'
@@ -39,8 +39,9 @@ require 'puppet/parser/parser_support'
 # mode: ruby
 # End:
 
+# $Id$
 
-..end grammar.ra modeval..id9134b179f4
+..end grammar.ra modeval..idfef5d70c9f
 
 ##### racc 1.4.5 generates ###
 
@@ -956,7 +957,7 @@ module_eval <<'.,.,', 'grammar.ra', 174
   def _reduce_38( val, _values, result )
     type = val[0]
 
-    if type == :exported and ! Puppet[:storeconfigs]
+    if (type == :exported and ! Puppet[:storeconfigs]) and ! Puppet[:parseonly]
         error "You cannot collect without storeconfigs being set"
     end
 
@@ -1009,7 +1010,7 @@ module_eval <<'.,.,', 'grammar.ra', 199
     else
         args[:form] = val[1]
     end
-    if args[:form] == :exported and ! Puppet[:storeconfigs]
+    if args[:form] == :exported and ! Puppet[:storeconfigs] and ! Puppet[:parseonly]
         error "You cannot collect exported resources without storeconfigs being set"
     end
     result = ast AST::Collection, args