shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

bug #3295: install net-ldap < 0.9 with ruby 1.8.7

Browse Source 
(cherry picked from commit 1355c28734bcab3d67a70df093bf68473d52c78a)
This commit is contained in:
Javi Fontan 2014-11-12 13:44:37 +01:00
parent ebc431bc91
commit 62d58423b2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/install_gems/install_gems
View File

@ -12,9 +12,11 @@ end
if !defined?(RUBY_VERSION) || RUBY_VERSION < '1.9.0'
$nokogiri='nokogiri --version "< 1.6.0"'
LDAP='net-ldap --version "< 0.9"'
else
$nokogiri='nokogiri'
DEFAULT = DEFAULT_PRE + %w{hybrid}
LDAP='net-ldap'
end
DEFAULT = DEFAULT_PRE if !defined?(DEFAULT)
@ -24,7 +26,7 @@ GROUPS={
:sunstone => ['json', 'rack', 'sinatra', 'thin', 'zendesk_api', SQLITE],
:cloud => %w{amazon-ec2 rack sinatra thin uuidtools curb json},
:hybrid => %w{softlayer_api configparser azure},
:auth_ldap => 'net-ldap',
:auth_ldap => LDAP,
:vmware => %w{builder trollop},
:oneflow => %w{sinatra json treetop parse-cron},
:ec2_hybrid => 'aws-sdk --version "= 1.33"',
@ -35,7 +37,7 @@ GROUPS={
PACKAGES=GROUPS.keys
GEM_TEST={
'net-ldap' => 'net/ldap'
LDAP => 'net/ldap'
}
DISTRIBUTIONS={