diff options
| -rw-r--r-- | Modulefile | 2 | ||||
| -rw-r--r-- | lib/facter/pip_version.rb | 2 | ||||
| -rw-r--r-- | manifests/pip.pp | 8 | ||||
| -rw-r--r-- | manifests/requirements.pp | 1 | ||||
| -rw-r--r-- | manifests/virtualenv.pp | 2 |
5 files changed, 4 insertions, 11 deletions
@@ -1,5 +1,5 @@ name 'stankevich-python' -version '1.6.0' +version '1.6.2' author 'Sergey Stankevich' license 'Apache License, Version 2.0' diff --git a/lib/facter/pip_version.rb b/lib/facter/pip_version.rb index 131d1f9..bc725db 100644 --- a/lib/facter/pip_version.rb +++ b/lib/facter/pip_version.rb @@ -5,7 +5,7 @@ pkg = Puppet::Type.type(:package).new(:name => "python-pip") Facter.add("pip_version") do has_weight 100 setcode do - /^pip (\d+\.\d+\.?\d*).*$/.match(Facter::Util::Resolution.exec('pip --version'))[1] + /^pip (\d+\.\d+\.?\d*).*$/.match(Facter::Util::Resolution.exec('pip --version 2>/dev/null'))[1] end end diff --git a/manifests/pip.pp b/manifests/pip.pp index 367cdb3..4f91e59 100644 --- a/manifests/pip.pp +++ b/manifests/pip.pp @@ -120,14 +120,6 @@ define python::pip ( } } - latest: { - exec { "pip_install_${name}": - command => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; ${pip_env} --log ${cwd}/pip.log install -U ${install_args} \$wheel_support_flag ${proxy_flag} ${source}", - user => $owner, - environment => $environment, - } - } - default: { exec { "pip_uninstall_${name}": command => "echo y | ${pip_env} uninstall ${uninstall_args} ${proxy_flag} ${name}", diff --git a/manifests/requirements.pp b/manifests/requirements.pp index 5fa6eb9..11c5f00 100644 --- a/manifests/requirements.pp +++ b/manifests/requirements.pp @@ -102,6 +102,7 @@ define python::requirements ( user => $owner, subscribe => File[$requirements], environment => $environment, + path => ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'], } } diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp index 8c240ed..b9cd689 100644 --- a/manifests/virtualenv.pp +++ b/manifests/virtualenv.pp @@ -112,7 +112,7 @@ define python::virtualenv ( $distribute_pkg = $distribute ? { true => 'distribute', - default => '', + default => 'setuptools', } $pypi_index = $index ? { false => '', |