lib/ohai/plugins/os.rb in ohai-0.6.10 vs lib/ohai/plugins/os.rb in ohai-0.6.12.rc.1

- old
+ new

@@ -4,13 +4,13 @@ # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. @@ -20,11 +20,11 @@ require 'rbconfig' require_plugin 'kernel' -case ::Config::CONFIG['host_os'] +case ::RbConfig::CONFIG['host_os'] when /aix(.+)$/ os "aix" when /darwin(.+)$/ os "darwin" when /hpux(.+)$/ @@ -45,9 +45,9 @@ # Windows_NT kernel, so we herby decree that "windows" will refer to all # platforms built upon the Windows_NT kernel and have access to win32 or win64 # subsystems. os "windows" else - os ::Config::CONFIG['host_os'] + Object.const_get(defined?(RbConfig) ? :RbConfig : :Config)::CONFIG['host_os'] end os_version kernel[:release]