lib/hu/deploy.rb in hu-1.3.14 vs lib/hu/deploy.rb in hu-1.3.15
- old
+ new
@@ -275,11 +275,12 @@
puts 'Please bring the universe into a state'
puts 'where the above command succeeds, then try again.'
puts
exit 1
end
- ENV['EDITOR'] = ENV['GIT_EDITOR'] = old_editor
+ ENV['EDITOR'] = old_editor
+ ENV['GIT_EDITOR'] = old_git_editor
anykey
when :push_to_staging
run_each <<-EOS.strip_heredoc
:stream
git push #{push_url} release/#{release_tag}:master -f
@@ -486,12 +487,13 @@
@spinlock.synchronize do
print c
@minispin_last_char = Time.now
end
end
- rescue => e
- puts "Oops: #{e}".color(:red)
- sleep 5
+ rescue Errno::EIO
+ # Linux raises EIO on EOF, cf.
+ # https://github.com/ruby/ruby/blob/57fb2199059cb55b632d093c2e64c8a3c60acfbb/ext/pty/pty.c#L519
+ nil
end
_pid, status = Process.wait2(pid)
@minispin_last_char = :end
@tspin.join