opendev/puppet-subunit2sql
Code Issues Proposed changes

Don't hardcode the path to pip

Browse Source 
In at least some circumstances, our pip is installed into
/usr/local/bin to make sure that's added to the environment and
switch to dynamic path resolution when calling pip.

Change-Id: I4e53ce2aba1b8335025e180bd03a5f5e93461814
This commit is contained in:
Jeremy Stanley 2017-12-12 00:58:20 +00:00
parent e2743a3529
commit e02cfe94a3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/init.pp
View File

@ -38,7 +38,8 @@ class subunit2sql (
} }
exec { 'install-subunit2sql-safely': exec { 'install-subunit2sql-safely':
command => '/usr/bin/pip install --upgrade --upgrade-strategy=only-if-needed subunit2sql', command => 'pip install --upgrade --upgrade-strategy=only-if-needed subunit2sql',
path => '/usr/local/bin:/usr/bin:/bin/',
# This checks the current installed subunit2sql version with pip list and # This checks the current installed subunit2sql version with pip list and
# the latest version of subunit2sql on pypi with pip search and if they are # the latest version of subunit2sql on pypi with pip search and if they are
# different then we know we need to upgrade to reconcile the local version # different then we know we need to upgrade to reconcile the local version
@ -49,7 +50,7 @@ class subunit2sql (
# deps we've preinstalled from system packages because they lack wheels on # deps we've preinstalled from system packages because they lack wheels on
# PyPI and must be otherwise rebuilt from sdist instead (specifically # PyPI and must be otherwise rebuilt from sdist instead (specifically
# netifaces). # netifaces).
onlyif => '/bin/bash -c "test $(/usr/bin/pip list --format columns | sed -ne \'s/^subunit2sql\s\+\(.*\)$/\1/p\') != $(/usr/bin/pip search \'subunit2sql$\' | sed -ne \'s/^subunit2sql (\(.*\)).*$/\1/p\')"', onlyif => '/bin/bash -c "test $(pip list --format columns | sed -ne \'s/^subunit2sql\s\+\(.*\)$/\1/p\') != $(pip search \'subunit2sql$\' | sed -ne \'s/^subunit2sql (\(.*\)).*$/\1/p\')"',
require => [ require => [
Class['pip'], Class['pip'],
Package['python-mysqldb'], Package['python-mysqldb'],