Merge branch 'ticket/next/6928' into next

3 files changed, 6 insertions, 8 deletions

diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index 8339c51b7..d2bd06e94 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -156,7 +156,7 @@ resourceoverride:     resourceref LBRACE anyparams endcomma RBRACE {
 virtualresource:  at resource {
   type = val[0]
 
-  if (type == :exported and ! Puppet[:storeconfigs]) and ! Puppet[:parseonly]
+  if (type == :exported and ! Puppet[:storeconfigs])
     Puppet.warning addcontext("You cannot collect without storeconfigs being set")
   end
 
@@ -188,7 +188,7 @@ collection:     classref collectrhand LBRACE anyparams endcomma RBRACE {
   else
     args[:form] = val[1]
   end
-  if args[:form] == :exported and ! Puppet[:storeconfigs] and ! Puppet[:parseonly]
+  if args[:form] == :exported and ! Puppet[:storeconfigs]
     Puppet.warning addcontext("You cannot collect exported resources without storeconfigs being set; the collection will be ignored")
   end
   args[:override] = val[3]
@@ -208,7 +208,7 @@ collection:     classref collectrhand LBRACE anyparams endcomma RBRACE {
   else
     args[:form] = val[1]
   end
-  if args[:form] == :exported and ! Puppet[:storeconfigs] and ! Puppet[:parseonly]
+  if args[:form] == :exported and ! Puppet[:storeconfigs]
     Puppet.warning addcontext("You cannot collect exported resources without storeconfigs being set; the collection will be ignored")
   end
   result = ast AST::Collection, args
diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index 300ddddd6..611398d14 100644
--- a/lib/puppet/parser/parser.rb
+++ b/lib/puppet/parser/parser.rb
@@ -1366,7 +1366,7 @@ module_eval(<<'.,.,', 'grammar.ra', 156)
   def _reduce_50(val, _values, result)
       type = val[0]
 
-  if (type == :exported and ! Puppet[:storeconfigs]) and ! Puppet[:parseonly]
+  if (type == :exported and ! Puppet[:storeconfigs])
     Puppet.warning addcontext("You cannot collect without storeconfigs being set")
   end
 
@@ -1411,7 +1411,7 @@ module_eval(<<'.,.,', 'grammar.ra', 178)
   else
     args[:form] = val[1]
   end
-  if args[:form] == :exported and ! Puppet[:storeconfigs] and ! Puppet[:parseonly]
+  if args[:form] == :exported and ! Puppet[:storeconfigs]
     Puppet.warning addcontext("You cannot collect exported resources without storeconfigs being set; the collection will be ignored")
   end
   args[:override] = val[3]
@@ -1436,7 +1436,7 @@ module_eval(<<'.,.,', 'grammar.ra', 197)
   else
     args[:form] = val[1]
   end
-  if args[:form] == :exported and ! Puppet[:storeconfigs] and ! Puppet[:parseonly]
+  if args[:form] == :exported and ! Puppet[:storeconfigs]
     Puppet.warning addcontext("You cannot collect exported resources without storeconfigs being set; the collection will be ignored")
   end
   result = ast AST::Collection, args
diff --git a/lib/puppet/parser/type_loader.rb b/lib/puppet/parser/type_loader.rb
index 1fba73d0b..23fb78c0a 100644
--- a/lib/puppet/parser/type_loader.rb
+++ b/lib/puppet/parser/type_loader.rb
@@ -60,8 +60,6 @@ class Puppet::Parser::TypeLoader
 
   # Import our files.
   def import(file, current_file = nil)
-    return if Puppet[:ignoreimport]
-
     # use a path relative to the file doing the importing
     if current_file
       dir = current_file.sub(%r{[^/]+$},'').sub(/\/$/, '')