From c07d9f86a62a0c9c4ad8c9c8c290b58eeed087bb Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Thu, 23 Jan 2014 14:40:30 -0500 Subject: [PATCH] bugfix: loading a Cache without deps or user_deps stored causes an exception --- lib/rscons/cache.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rscons/cache.rb b/lib/rscons/cache.rb index c35b340..8d920e5 100644 --- a/lib/rscons/cache.rb +++ b/lib/rscons/cache.rb @@ -117,7 +117,7 @@ module Rscons # command used to build target must be identical return false unless @cache[:targets][target][:command] == command - cached_deps = @cache[:targets][target][:deps] or [] + cached_deps = @cache[:targets][target][:deps] || [] cached_deps_fnames = cached_deps.map { |dc| dc[:fname] } if options[:strict_deps] # depedencies passed in must exactly equal those in the cache @@ -129,7 +129,7 @@ module Rscons # set of user dependencies must match user_deps = env.get_user_deps(target) || [] - cached_user_deps = @cache[:targets][target][:user_deps] or [] + cached_user_deps = @cache[:targets][target][:user_deps] || [] cached_user_deps_fnames = cached_user_deps.map { |dc| dc[:fname] } return false unless user_deps == cached_user_deps_fnames