Merge branch 'master' into 13822-nm-delayed-daemon

[arvados.git] / services / login-sync / arvados-login-sync.gemspec

diff --git a/services/login-sync/arvados-login-sync.gemspec b/services/login-sync/arvados-login-sync.gemspec
index 6de9a94f729d431658e19a6247b96cd60ccd1333..4fb31a742e91ea76372f6fa8986748dde7414d21 100644 (file)
--- a/services/login-sync/arvados-login-sync.gemspec
+++ b/services/login-sync/arvados-login-sync.gemspec
@@ -8,7 +8,8 @@ if not File.exists?('/usr/bin/git') then
 end
 
 git_latest_tag = `git describe --abbrev=0`
-git_timestamp = `git log -n1 --first-parent --format=%ct`
+git_latest_tag = git_latest_tag.encode('utf-8').strip
+git_timestamp, git_hash = `git log -n1 --first-parent --format=%ct:%H .`.chomp.split(":")
 git_timestamp = Time.at(git_timestamp.to_i).utc
 
 Gem::Specification.new do |s|