Download as
Browse Code »

Commit 7e268572bbb708c102ea25b4b75321609f1308ca

Authored by Jacob Vosmaer
1 parent 70937bfa
Exists in master and in 2 other branches 7-2-stable, 7-2-stable-ee

Update dependency and Ohai syntax

Showing 1 changed file with 5 additions and 7 deletions   Show diff stats
config/software/mysql-client.rb
  Diff comments   View file @7e26857
@@ -18,11 +18,9 @@ @@ -18,11 +18,9 @@
18 name "mysql-client" 18 name "mysql-client"
19 default_version "5.5.37" 19 default_version "5.5.37"
20 20
21 -dependencies [  
22 - "openssl",  
23 - "zlib",  
24 - "ncurses"  
25 - ] 21 +dependency "openssl"
  22 +dependency "zlib"
  23 +dependency "ncurses"
26 24
27 source :url => "http://dev.mysql.com/get/Downloads/MySQL-5.5/mysql-5.5.37.tar.gz", 25 source :url => "http://dev.mysql.com/get/Downloads/MySQL-5.5/mysql-5.5.37.tar.gz",
28 :md5 => "bf1d80c66d4822ec6036300399a33c03" 26 :md5 => "bf1d80c66d4822ec6036300399a33c03"
@@ -38,14 +36,14 @@ env = { @@ -38,14 +36,14 @@ env = {
38 "PATH" => "#{install_dir}/embedded/bin:#{ENV['PATH']}", 36 "PATH" => "#{install_dir}/embedded/bin:#{ENV['PATH']}",
39 } 37 }
40 38
41 -unless OHAI.platform =~ /ubuntu/ && OHAI.platform_version =~ /^14.04/ 39 +unless Ohai['platform'] =~ /ubuntu/ && Ohai['platform_version'] =~ /^14.04/
42 # Perhaps we can drop LD_LIBRARY_PATH on all platforms? For now, all we know 40 # Perhaps we can drop LD_LIBRARY_PATH on all platforms? For now, all we know
43 # is that it breaks the build on Ubuntu 14.04. 41 # is that it breaks the build on Ubuntu 14.04.
44 env.merge!("LD_LIBRARY_PATH" => "#{install_dir}/embedded/lib") 42 env.merge!("LD_LIBRARY_PATH" => "#{install_dir}/embedded/lib")
45 end 43 end
46 44
47 # Force CentOS-5 to use gcc/g++ v4.4 45 # Force CentOS-5 to use gcc/g++ v4.4
48 -if OHAI.platform =~ /centos/ and OHAI.platform_version =~ /^5/ 46 +if Ohai['platform'] =~ /centos/ and Ohai['platform_version'] =~ /^5/
49 env.merge!( { 47 env.merge!( {
50 "CC" => "gcc44", 48 "CC" => "gcc44",
51 "CXX" => "g++44" 49 "CXX" => "g++44"