From: Ethan <ethan@medidata>
Date: Tue, 31 Jan 2012 03:33:03 +0000 (-0500)
Subject: rescue any error invoking external commands attempting to determine OS_VERSION; just... 
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/b866e07d700d9c204e81d5d5aa9a91adead5ea86

rescue any error invoking external commands attempting to determine OS_VERSION; just return RUBY_PLATFORM on failure.
---

diff --git a/lib/google/api_client/environment.rb b/lib/google/api_client/environment.rb
index e5abe93345..9faa28f7d6 100644
--- a/lib/google/api_client/environment.rb
+++ b/lib/google/api_client/environment.rb
@@ -16,15 +16,19 @@
 module Google
   class APIClient
     module ENV
-      OS_VERSION = if RUBY_PLATFORM =~ /mswin|win32|mingw|bccwin|cygwin/
-        # TODO(bobaman)
-        # Confirm that all of these Windows environments actually have access
-        # to the `ver` command.
-        `ver`.sub(/\s*\[Version\s*/, '/').sub(']', '').strip
-      elsif RUBY_PLATFORM =~ /darwin/i
-        "Mac OS X/#{`sw_vers -productVersion`}"
-      else
-        `uname -sr`.sub(' ', '/')
+      OS_VERSION = begin
+        if RUBY_PLATFORM =~ /mswin|win32|mingw|bccwin|cygwin/
+          # TODO(bobaman)
+          # Confirm that all of these Windows environments actually have access
+          # to the `ver` command.
+          `ver`.sub(/\s*\[Version\s*/, '/').sub(']', '').strip
+        elsif RUBY_PLATFORM =~ /darwin/i
+          "Mac OS X/#{`sw_vers -productVersion`}"
+        else
+          `uname -sr`.sub(' ', '/')
+        end
+      rescue Exception
+        RUBY_PLATFORM
       end
     end
   end