Use python -m pip to work around a permissions issue on Windows

hlaf · hlaf · commit 772d8f4bce07 · 2020-12-08T13:59:23.000Z
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -46,8 +46,12 @@
     default  => 'gunicorn',
   }
 
+  if $::operatingsystem == 'windows' {
+    $python_executable = 'python.exe'
+  }
+
   $pip_provider = $::operatingsystem ? {
-    'windows' => 'pip.exe',
+    'windows' => "${python_executable} -m pip",
     default   => 'pip',
   }
 
diff --git a/manifests/pip.pp b/manifests/pip.pp
@@ -226,7 +226,8 @@
                                     " | tr -d '[:space:]'"])
           $unless_command = "[ \$(${latest_version}) = \$(${installed_version}) ]"
         } else {
-          $unless_command = join(["${python_env}/python.exe -c \"",
+          $python_executable = getvar('python::params::python_executable')
+          $unless_command = join(["${python_env}/${python_executable} -c \"",
                                   "import subprocess;",
                                   "import sys;",
                                   "import re;",

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,12 @@`
`46`	`46`	`default => 'gunicorn',`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ if $::operatingsystem == 'windows' {`
	`50`	`+ $python_executable = 'python.exe'`
	`51`	`+ }`
	`52`	`+`
`49`	`53`	`$pip_provider = $::operatingsystem ? {`
`50`		`- 'windows' => 'pip.exe',`
	`54`	`+ 'windows' => "${python_executable} -m pip",`
`51`	`55`	`default => 'pip',`
`52`	`56`	`}`
`53`	`57`