diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-04-13 16:57:11 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-04-13 16:57:11 -0700 |
| commit | 5915814c47649bb4b957b4be4fcee5919b859451 (patch) | |
| tree | 3c977fddfcfe7dd074682d62d44e919f450c3769 /lib/puppet/parser | |
| parent | 24a277c5e805ce16e0b86e17e6cb2fbe1945ae07 (diff) | |
| download | puppet-5915814c47649bb4b957b4be4fcee5919b859451.tar.gz puppet-5915814c47649bb4b957b4be4fcee5919b859451.tar.xz puppet-5915814c47649bb4b957b4be4fcee5919b859451.zip | |
Revert "(#6928) Removed --ignoreimport"
This reverts commit 24a277c5e805ce16e0b86e17e6cb2fbe1945ae07.
Despite not needing --ignoreimport as an option anymore, it's still used
internally and has to stay.
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/type_loader.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/parser/type_loader.rb b/lib/puppet/parser/type_loader.rb index 23fb78c0a..1fba73d0b 100644 --- a/lib/puppet/parser/type_loader.rb +++ b/lib/puppet/parser/type_loader.rb @@ -60,6 +60,8 @@ 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(/\/$/, '') |