Merge pull request #273 from jgawor/empty_repo_root

#269: Ignore empty repository roots
cloudfoundry · Mar 10, 2016 · e2ab02e · e2ab02e
2 parents 2a3c175 + 1da3df6
commit e2ab02e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/resources/download_buildpack_cache.rb b/resources/download_buildpack_cache.rb
@@ -172,14 +172,18 @@ def collect_configs(config_files = nil, cached_hosts = nil, exclude_files = nil)
       end
       unless config.nil?
         config = config[DRIVER] || config
-        if config.has_key?(REPOSITORY_ROOT) && config.has_key?(VERSION) && (File.exists?(index_path(config)) || cached_hosts.nil? || cached_hosts.include?(URI(repository_root(config)).host))
+        if repository_configuration?(config) && (File.exists?(index_path(config)) || cached_hosts.nil? || cached_hosts.include?(URI(repository_root(config)).host))
           configs.push(config)
         end
       end
     end
     configs
   end
 
+  def repository_configuration?(configuration)
+    configuration.has_key?(VERSION) && configuration.has_key?(REPOSITORY_ROOT) && !configuration[REPOSITORY_ROOT].empty?
+  end
+
   def default_repository_root
     LibertyBuildpack::Util::ConfigurationUtils.load('repository', false)['default_repository_root'].chomp('/')
   end