diff --git a/bin/crew b/bin/crew index a6f90ea48..5b8d52a47 100755 --- a/bin/crew +++ b/bin/crew @@ -1526,7 +1526,7 @@ def upload(pkg_name = nil, pkg_version = nil, gitlab_token = nil, gitlab_token_u puts "curl -Ls #{new_url} | sha256sum" if CREW_VERBOSE upstream_sha256 = `curl -Ls #{new_url} | sha256sum`.chomp.split.first if upstream_sha256 == new_sha256 - puts output.lightgreen + puts "#{output}\n".lightgreen else if CREW_VERBOSE puts "expected sha256 hash=#{new_sha256}" diff --git a/lib/buildsystems/ruby.rb b/lib/buildsystems/ruby.rb index ee10faab7..d7e238864 100644 --- a/lib/buildsystems/ruby.rb +++ b/lib/buildsystems/ruby.rb @@ -74,7 +74,10 @@ class RUBY < Package system "gem contents #{@gem_name} > #{@gem_filelist_path}" unless File.file?(@gem_filelist_path) @device = ConvenienceFunctions.load_symbolized_json pkg_info = @device[:installed_packages].select { |pkg| pkg[:name] == name } [0] - @install_gem = false if Gem::Version.new(version) == pkg_info[:version] + # Handle case of Chromebrew gem pkg not yet having been installed + # or having a changed version number despite the gem having been + # installed. + @install_gem = false if pkg_info.nil? || Gem::Version.new(version) == pkg_info[:version] end end diff --git a/lib/const.rb b/lib/const.rb index c7372cb0a..3f1a01b4e 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -3,7 +3,7 @@ require 'etc' OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0' -CREW_VERSION ||= '1.53.5' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION +CREW_VERSION ||= '1.53.6' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION # Kernel architecture. KERN_ARCH ||= Etc.uname[:machine]