PUPINF-506: Add very basic Windows support to requirements.pp

hlaf · hlaf · commit e5e3f9786d7a · 2024-07-02T13:52:47.000+01:00
diff --git a/manifests/requirements.pp b/manifests/requirements.pp
@@ -73,6 +73,7 @@
   $environment            = [],
   $forceupdate            = false,
   $cwd                    = undef,
+  $pip_env                = undef,
   $extra_pip_args         = '',
   $manage_requirements    = true,
   $fix_requirements_owner = true,
@@ -99,9 +100,12 @@
     default  => $virtualenv,
   }
 
-  $pip_env = $virtualenv ? {
-    'system' => "${::python::exec_prefix} pip",
-    default  => "${::python::exec_prefix} ${virtualenv}/bin/pip",
+  $pip_env_ = $pip_env ? {
+    undef   => $virtualenv ? {
+      'system' => "${::python::exec_prefix} pip",
+      default  => "${::python::exec_prefix} ${virtualenv}/bin/pip",
+    },
+    default => $pip_env,
   }
 
   $proxy_flag = $proxy ? {
@@ -129,13 +133,19 @@
   }
 
   exec { "python_requirements${name}":
-    provider    => shell,
-    command     => "${pip_env} --log ${log}/pip.log install ${proxy_flag} ${src_flag} -r ${requirements} ${extra_pip_args}",
+    #provider    => shell,
+    command     => "${pip_env_} --log ${log}/pip.log install ${proxy_flag} ${src_flag} -r ${requirements} ${extra_pip_args}",
     refreshonly => !$forceupdate,
     timeout     => $timeout,
     cwd         => $cwd,
-    user        => $owner,
     subscribe   => File[$requirements],
     environment => $environment,
   }
+
+  if $::operatingsystem != 'windows' {
+    Exec["python_requirements${name}"] {
+      user => $owner,
+    }
+  }
+
 }
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
@@ -217,6 +217,7 @@
         group          => $group,
         cwd            => $cwd,
         require        => Exec["python_virtualenv_${venv_dir}"],
+        pip_env        => $pip_cmd,
         extra_pip_args => $extra_pip_args,
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,7 @@`
`217`	`217`	`group => $group,`
`218`	`218`	`cwd => $cwd,`
`219`	`219`	`require => Exec["python_virtualenv_${venv_dir}"],`
	`220`	`+ pip_env => $pip_cmd,`
`220`	`221`	`extra_pip_args => $extra_pip_args,`
`221`	`222`	`}`
`222`	`223`	`}`