diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-04-13 17:02:05 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-04-13 17:02:05 -0700 |
| commit | 7817ccb3438ad2742a98694373e42b65df86eda7 (patch) | |
| tree | 7c2f3adb6f6513b23b708be737f229c7fae98da2 /lib/puppet/parser | |
| parent | 02691637553d5637ee01a433a516b5d8cc9768a9 (diff) | |
| parent | 5915814c47649bb4b957b4be4fcee5919b859451 (diff) | |
| download | puppet-7817ccb3438ad2742a98694373e42b65df86eda7.tar.gz puppet-7817ccb3438ad2742a98694373e42b65df86eda7.tar.xz puppet-7817ccb3438ad2742a98694373e42b65df86eda7.zip | |
Merge branch 'ticket/next/6928' into next
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(/\/$/, '') |