Merge pull request voxpupuli#135 from ive/master

stankevich · stankevich · commit 13531dc65be9 · 2014-10-30T16:36:04.000-04:00
Fixed pip non-root installation
diff --git a/manifests/pip.pp b/manifests/pip.pp
@@ -153,6 +153,7 @@
         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} ;}",
         unless      => "${pip_env} freeze | grep -i -e ${grep_regex}",
         user        => $owner,
+        cwd         => $cwd,
         environment => $environment,
         path        => ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'],
         timeout     => $timeout,
@@ -165,6 +166,7 @@
         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} ;}",
         unless      => "${pip_env} freeze | grep -i -e ${grep_regex}",
         user        => $owner,
+        cwd         => $cwd,
         environment => $environment,
         path        => ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'],
         timeout     => $timeout,
@@ -177,6 +179,7 @@
         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} ;}",
         unless      => "${pip_env} search ${source} | grep -i INSTALLED | grep -i latest",
         user        => $owner,
+        cwd         => $cwd,
         environment => $environment,
         path        => ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'],
         timeout     => $timeout,
@@ -189,6 +192,7 @@
         command     => "echo y | ${pip_env} uninstall ${uninstall_args} ${proxy_flag}",
         onlyif      => "${pip_env} freeze | grep -i -e ${grep_regex}",
         user        => $owner,
+        cwd         => $cwd,
         environment => $environment,
         path        => ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'],
         timeout     => $timeout,
