chiu
/
google-api-ruby-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix odd conflict with VERSION & logger

This commit is contained in:
Steven Bazyl 2013-01-04 16:49:27 -08:00
parent 7feb61f70d
commit 55b4a94715
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/google/api_client.rb
View File

@ -19,8 +19,8 @@ require 'multi_json'
require 'compat/multi_json' require 'compat/multi_json'
require 'stringio' require 'stringio'
require 'google/api_client/logging'
require 'google/api_client/version' require 'google/api_client/version'
require 'google/api_client/logging'
require 'google/api_client/errors' require 'google/api_client/errors'
require 'google/api_client/environment' require 'google/api_client/environment'
require 'google/api_client/discovery' require 'google/api_client/discovery'
@ -94,7 +94,7 @@ module Google
end end
self.user_agent = options[:user_agent] || ( self.user_agent = options[:user_agent] || (
"#{application_string} " + "#{application_string} " +
"google-api-ruby-client/#{VERSION::STRING} " + "google-api-ruby-client/#{Google::APIClient::VERSION::STRING} " +
ENV::OS_VERSION ENV::OS_VERSION
).strip ).strip
# The writer method understands a few Symbols and will generate useful # The writer method understands a few Symbols and will generate useful