X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..7302041c3f2c05098816f4fd9e3e538811f25a4e:/cookbooks/python/resources/package.rb?ds=sidebyside diff --git a/cookbooks/python/resources/package.rb b/cookbooks/python/resources/package.rb index 4a3cb9f01..0a3f49170 100644 --- a/cookbooks/python/resources/package.rb +++ b/cookbooks/python/resources/package.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: python +# Cookbook:: python # Resource:: package # -# Copyright 2017, OpenStreetMap Foundation +# Copyright:: 2017, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,11 +17,14 @@ # limitations under the License. # +unified_mode true + default_action :install property :package_name, :kind_of => String, :name_property => true property :version, :kind_of => String property :python_version, :kind_of => String +property :python_virtualenv, :kind_of => String action :install do if new_resource.version.nil? @@ -46,6 +49,10 @@ end action_class do def pip_command - "pip#{new_resource.python_version}" + if new_resource.python_virtualenv + "#{new_resource.python_virtualenv}/bin/pip" + else + "pip#{new_resource.python_version}" + end end end