summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-04-13 14:38:23 -0700
committerNick Lewis <nick@puppetlabs.com>2011-04-13 15:41:03 -0700
commit24a277c5e805ce16e0b86e17e6cb2fbe1945ae07 (patch)
treea9a3a3427e2b20829c3de699483a117f3f65fb22 /lib/puppet/parser
parentfc36e8de8cdf32ae13b9241f9a9eef4c2727056e (diff)
downloadpuppet-24a277c5e805ce16e0b86e17e6cb2fbe1945ae07.tar.gz
puppet-24a277c5e805ce16e0b86e17e6cb2fbe1945ae07.tar.xz
puppet-24a277c5e805ce16e0b86e17e6cb2fbe1945ae07.zip
(#6928) Removed --ignoreimport
This was only used with --parseonly, which is gone. Paired-With: Jesse Wolfe
Diffstat (limited to 'lib/puppet/parser')
-rw-r--r--lib/puppet/parser/type_loader.rb2
1 files changed, 0 insertions, 2 deletions
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(/\/$/, '')