diff options
| author | Noah Kantrowitz <noah@coderanger.net> | 2014-10-04 15:31:51 -0700 |
|---|---|---|
| committer | Noah Kantrowitz <noah@coderanger.net> | 2014-10-04 15:31:51 -0700 |
| commit | e6291e1af8e923f3af4c5ea864e815d27c53d4aa (patch) | |
| tree | d3e44b3e109b50ac29437d61196b908d34131439 | |
| parent | 41ff78b4088c4687637a1433dc1a17fc00a5523f (diff) | |
| download | chef-e6291e1af8e923f3af4c5ea864e815d27c53d4aa.tar.gz | |
More comment-y goodness.
| -rw-r--r-- | lib/chef/cookbook_version.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/chef/cookbook_version.rb b/lib/chef/cookbook_version.rb index d76ec2b163..a72aab6490 100644 --- a/lib/chef/cookbook_version.rb +++ b/lib/chef/cookbook_version.rb @@ -679,7 +679,9 @@ class Chef # Check if path is actually under root_path next if parts[0] == '..' if segment == :templates || segment == :files + # Check if pathname looks like files/foo or templates/foo (unscoped) if pathname.each_filename.to_a.length == 2 + # Use root_default in case the same path exists at root_default and default return [ pathname.to_s, 'root_default' ] else return [ pathname.to_s, parts[1] ] |