Permalink
Browse files

overriding also OS_NAME and OS_VERSION

  • Loading branch information...
1 parent 895be6e commit 9fe86e2dc8f958b037545feb801af62da5937af4 @goldmann goldmann committed Nov 25, 2009
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/cantiere/config.rb
View
@@ -82,8 +82,8 @@ def initialize( project_config = Hash.new )
end
@build_arch = ENV['CANTIERE_ARCH'].nil? ? @arch : ENV['CANTIERE_ARCH']
- @os_name = @os.name #ENV['CANTIERE_OS_NAME'].nil? ? APPLIANCE_DEFAULTS['os_name'] : ENV['CANTIERE_OS_NAME']
- @os_version = @os.version #ENV['CANTIERE_OS_VERSION'].nil? ? APPLIANCE_DEFAULTS['os_version'] : ENV['CANTIERE_OS_VERSION']
+ @os_name = ENV['CANTIERE_OS_NAME'].nil? ? @os.name : ENV['CANTIERE_OS_NAME']
+ @os_version = ENV['CANTIERE_OS_VERSION'].nil? ? @os.version : ENV['CANTIERE_OS_VERSION']
end
attr_reader :name

0 comments on commit 9fe86e2

Please sign in to comment.