Skip to content

Commit

Permalink
correct how and when the sslfix for python is run
Browse files Browse the repository at this point in the history
  • Loading branch information
joshk committed Mar 10, 2013
1 parent 546cbbf commit c73fbf0
Showing 1 changed file with 23 additions and 1 deletion.
24 changes: 23 additions & 1 deletion ci_environment/python/recipes/multi.rb
Expand Up @@ -101,7 +101,7 @@

# https://github.com/denik/sslfix
# http://stackoverflow.com/questions/3241658/how-to-install-ssl-for-python-2-5-on-debian-linux
script "install libbluetooth-dev and sslfix" do
script "install libbluetooth-dev and sslfix set 1 (#{py})" do
interpreter "bash"
user node.travis_build_environment.user
group node.travis_build_environment.group
Expand All @@ -119,6 +119,26 @@
action :nothing
end

# https://github.com/denik/sslfix
# http://stackoverflow.com/questions/3241658/how-to-install-ssl-for-python-2-5-on-debian-linux
script "install libbluetooth-dev and sslfix set 2 (#{py})" do
interpreter "bash"
user node.travis_build_environment.user
group node.travis_build_environment.group

cwd node.travis_build_environment.home
code <<-EOH
sudo apt-get install libbluetooth-dev
#{installation_root}/#{py}_with_system_site_packages/bin/pip install --quiet sslfix --use-mirrors
EOH

environment({ "VIRTUAL_ENV_DISABLE_PROMPT" => "true" })

not_if { !["python2.5", "2.5"].include?(py.to_s.downcase) }

action :nothing
end

script "preinstall pip packages for virtualenv set 1 (#{py})" do
interpreter "bash"
user node.travis_build_environment.user
Expand Down Expand Up @@ -159,6 +179,7 @@

action :create
# commented out until we find a workaround for Vagrant issue #516
notifies :run, resources(:script => "install libbluetooth-dev and sslfix set 1 (#{py})")
notifies :run, resources(:script => "preinstall pip packages for virtualenv set 1 (#{py})")
end

Expand All @@ -172,6 +193,7 @@

action :create
# commented out until we find a workaround for Vagrant issue #516
notifies :run, resources(:script => "install libbluetooth-dev and sslfix set 2 (#{py})")
notifies :run, resources(:script => "preinstall pip packages for virtualenv set 2 (#{py})")
end
end

0 comments on commit c73fbf0

Please sign in to comment.