Merge remote branch 'remotes/upstream/master'

[arvados.git] / lib / google / api_client / environment.rb

diff --git a/lib/google/api_client/environment.rb b/lib/google/api_client/environment.rb
index 7bb7966cfcaeaf05cf5855d52d5e67de789ea507..dbdb2d8ebeb53b187a841fcc9e02f9a3c3edf444 100644 (file)
--- a/lib/google/api_client/environment.rb
+++ b/lib/google/api_client/environment.rb
@@ -5,7 +5,7 @@ module Google
         # TODO(bobaman)
         # Confirm that all of these Windows environments actually have access
         # to the `ver` command.
-        `ver`.sub(/\s*\[Version\s*/, '/').sub(']', '')
+        `ver`.sub(/\s*\[Version\s*/, '/').sub(']', '').strip
       elsif RUBY_PLATFORM =~ /darwin/i
         "Mac OS X/#{`sw_vers -productVersion`}"
       else