lib/kameleon/engine.rb in kameleon-builder-2.6.6 vs lib/kameleon/engine.rb in kameleon-builder-2.6.7

- old
+ new

@@ -45,12 +45,10 @@ @cache.cwd = @cwd @cache.polipo_path = @options[:polipo_path] @cache.name = @recipe.name @cache.mode = @options[:enable_cache] ? :build : :from @cache.cache_path = @options[:from_cache] - # I'm passing the Pathname objects - @cache.recipe_files = @recipe.all_files @cache.recipe_path = @recipe.path @cache.archive_format = @options[:cache_archive_compression] if @options[:proxy] != "" @cache.polipo_cmd_options['parentProxy'] = @options[:proxy] end @@ -69,9 +67,13 @@ end @recipe.global["proxy_local"] = @recipe.global["proxy_out"] = @recipe.global["proxy_in"] = proxy_url end @recipe.resolve! + + if @options[:enable_cache] || @options[:from_cache] then + @cache.recipe_files = @recipe.all_files + end begin Kameleon.ui.info("Creating kameleon build directory : #{@cwd}") FileUtils.mkdir_p @cwd rescue