Skip to content

Commit f80daf3

Browse files
gangueraganguera
committed
Using cwd to set the log directory is not valid after accepting pull request voxpupuli#135 
1 parent 2fb01de commit f80daf3

2 files changed

Lines changed: 19 additions & 8 deletions

File tree

‎manifests/pip.pp‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,13 @@
3838
# String. Any additional installation arguments that will be supplied
3939
# when running pip install.
4040
#
41-
# [*uninstall args*]
41+
# [*uninstall_args*]
4242
# String. Any additional arguments that will be supplied when running
4343
# pip uninstall.
4444
#
45+
# [*log_dir*]
46+
# String. Log directory.
47+
#
4548
# === Examples
4649
#
4750
# python::pip { 'flask':
@@ -67,7 +70,7 @@
6770
$install_args = '',
6871
$uninstall_args = '',
6972
$timeout = 1800,
70-
$log_dir = '/',
73+
$log_dir = '/tmp',
7174
) {
7275

7376
# Parameter validation
@@ -80,6 +83,11 @@
8083
}
8184

8285
$cwd = $virtualenv ? {
86+
'system' => '/',
87+
default => $virtualenv,
88+
}
89+
90+
$log = $virtualenv ? {
8391
'system' => $log_dir,
8492
default => $virtualenv,
8593
}
@@ -150,7 +158,7 @@
150158
# Version formats as per http://guide.python-distribute.org/specification.html#standard-versioning-schemes
151159
# Explicit version.
152160
exec { "pip_install_${name}":
153-
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 ${install_args} \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source}==${ensure} || ${pip_env} --log ${cwd}/pip.log install ${install_args} ${proxy_flag} ${install_args} ${install_editable} ${source}==${ensure} ;}",
161+
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 ${log}/pip.log install ${install_args} \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source}==${ensure} || ${pip_env} --log ${log}/pip.log install ${install_args} ${proxy_flag} ${install_args} ${install_editable} ${source}==${ensure} ;}",
154162
unless => "${pip_env} freeze | grep -i -e ${grep_regex}",
155163
user => $owner,
156164
cwd => $cwd,
@@ -163,7 +171,7 @@
163171
present: {
164172
# Whatever version is available.
165173
exec { "pip_install_${name}":
166-
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 \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source} || ${pip_env} --log ${cwd}/pip.log install ${proxy_flag} ${install_args} ${install_editable} ${source} ;}",
174+
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 ${log}/pip.log install \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source} || ${pip_env} --log ${log}/pip.log install ${proxy_flag} ${install_args} ${install_editable} ${source} ;}",
167175
unless => "${pip_env} freeze | grep -i -e ${grep_regex}",
168176
user => $owner,
169177
cwd => $cwd,
@@ -176,7 +184,7 @@
176184
latest: {
177185
# Latest version.
178186
exec { "pip_install_${name}":
179-
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 --upgrade \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source} || ${pip_env} --log ${cwd}/pip.log install --upgrade ${proxy_flag} ${install_args} ${install_editable} ${source} ;}",
187+
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 ${log}/pip.log install --upgrade \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source} || ${pip_env} --log ${log}/pip.log install --upgrade ${proxy_flag} ${install_args} ${install_editable} ${source} ;}",
180188
unless => "${pip_env} search ${source} | grep -i INSTALLED | grep -i latest",
181189
user => $owner,
182190
cwd => $cwd,

‎manifests/requirements.pp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
# [*fix_requirements_owner*]
4242
# Change owner and group of requirements file. Default: true
4343
#
44+
# [*log_dir*]
45+
# String. Log directory.
46+
#
4447
# === Examples
4548
#
4649
# python::requirements { '/var/www/project1/requirements.txt':
@@ -66,7 +69,7 @@
6669
$cwd = undef,
6770
$extra_pip_args = '',
6871
$fix_requirements_owner = true,
69-
$log_dir = '/',
72+
$log_dir = '/tmp',
7073
) {
7174

7275
if $virtualenv == 'system' and ($owner != 'root' or $group != 'root') {
@@ -81,7 +84,7 @@
8184
$group_real = undef
8285
}
8386

84-
$rootdir = $virtualenv ? {
87+
$log = $virtualenv ? {
8588
'system' => $log_dir,
8689
default => $virtualenv,
8790
}
@@ -117,7 +120,7 @@
117120

118121
exec { "python_requirements${name}":
119122
provider => shell,
120-
command => "${pip_env} --log ${rootdir}/pip.log install ${proxy_flag} ${src_flag} -r ${requirements} ${extra_pip_args}",
123+
command => "${pip_env} --log ${log}/pip.log install ${proxy_flag} ${src_flag} -r ${requirements} ${extra_pip_args}",
121124
refreshonly => !$forceupdate,
122125
timeout => 1800,
123126
cwd => $cwd,

0 commit comments

Comments
 (0)