(#6928) Removed --ignoreimport

This was only used with --parseonly, which is gone.

Paired-With: Jesse Wolfe

7 files changed, 10 insertions, 13 deletions

diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index fc8616817..317a61436 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -429,10 +429,6 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
     Puppet.settings.use :main, :agent, :ssl
 
-    # Always ignoreimport for agent. It really shouldn't even try to import,
-    # but this is just a temporary band-aid.
-    Puppet[:ignoreimport] = true
-
     # We need to specify a ca location for all of the SSL-related i
     # indirected classes to work; in fingerprint mode we just need
     # access to the local files and we don't need a ca.
diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb
index 5779e799c..a63c2ddae 100644
--- a/lib/puppet/application/apply.rb
+++ b/lib/puppet/application/apply.rb
@@ -31,6 +31,11 @@ class Puppet::Application::Apply < Puppet::Application
     exit 1
   end
 
+  option("--ignoreimport") do
+    puts "--ignoreimport has been removed. Please use 'puppet parser validate <manifest>'"
+    exit 1
+  end
+
   def help
     <<-HELP
 
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index a90829ae0..924e671fb 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -30,6 +30,11 @@ class Puppet::Application::Master < Puppet::Application
     exit 1
   end
 
+  option("--ignoreimport") do
+    puts "--ignoreimport has been removed. Please use 'puppet parser validate <manifest>'"
+    exit 1
+  end
+
   def help
     <<-HELP
 
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 680762b94..47e625815 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -90,9 +90,6 @@ module Puppet
         $LOAD_PATH << value
       end
     },
-    :ignoreimport => [false, "A parameter that can be used in commit
-      hooks, since it enables you to parse-check a single file rather
-      than requiring that all files exist."],
     :authconfig => [ "$confdir/namespaceauth.conf",
       "The configuration file that defines the rights to the different
       namespaces and methods.  This can be used as a coarse-grained
diff --git a/lib/puppet/node/environment.rb b/lib/puppet/node/environment.rb
index dc631979e..4589ea64c 100644
--- a/lib/puppet/node/environment.rb
+++ b/lib/puppet/node/environment.rb
@@ -150,7 +150,6 @@ class Puppet::Node::Environment
   private
 
   def perform_initial_import
-    return empty_parse_result if Puppet.settings[:ignoreimport]
     parser = Puppet::Parser::Parser.new(self)
     if code = Puppet.settings.uninterpolated_value(:code, name.to_s) and code != ""
       parser.string = code
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(/\/$/, '')
diff --git a/lib/puppet/util/rdoc.rb b/lib/puppet/util/rdoc.rb
index c00bc6f85..2a6dbdfa5 100644
--- a/lib/puppet/util/rdoc.rb
+++ b/lib/puppet/util/rdoc.rb
@@ -6,8 +6,6 @@ module Puppet::Util::RDoc
   # launch a rdoc documenation process
   # with the files/dir passed in +files+
   def rdoc(outputdir, files, charset = nil)
-      Puppet[:ignoreimport] = true
-
       # then rdoc
       require 'rdoc/rdoc'
       require 'rdoc/options'
@@ -41,7 +39,6 @@ module Puppet::Util::RDoc
 
   # launch a output to console manifest doc
   def manifestdoc(files)
-    Puppet[:ignoreimport] = true
     files.select { |f| FileTest.file?(f) }.each do |f|
       parser = Puppet::Parser::Parser.new(Puppet::Node::Environment.new(Puppet[:environment]))
       parser.file = f