Remove flock

windmill-labs · Nov 27, 2024 · 0a44165 · 0a44165
1 parent ac8d359
commit 0a44165
Showing 1 changed file with 35 additions and 20 deletions.
diff --git a/backend/windmill-worker/src/python_executor.rs b/backend/windmill-worker/src/python_executor.rs
@@ -1322,7 +1322,11 @@ pub async fn handle_python_reqs(
         } else {
             let fssafe_req = NON_ALPHANUM_CHAR.replace_all(&req, "_").to_string();
             #[cfg(unix)]
-            let req = format!("'{}'", req);
+            let req = if no_uv_install {
+                format!("'{}'", req)
+            } else {
+                req.clone()
+            };
 
             #[cfg(windows)]
             let req = format!("{}", req);
@@ -1403,25 +1407,36 @@ pub async fn handle_python_reqs(
 
             #[cfg(unix)]
             {
-                let mut flock_cmd = Command::new(FLOCK_PATH.as_str());
-                flock_cmd
-                    .env_clear()
-                    .envs(PROXY_ENVS.clone())
-                    .envs(envs)
-                    .args([
-                        "-x",
-                        &format!(
-                            "{}/{}-{}.lock",
-                            LOCK_CACHE_DIR,
-                            if no_uv_install { "pip" } else { "py311" },
-                            fssafe_req
-                        ),
-                        "--command",
-                        &command_args.join(" "),
-                    ])
-                    .stdout(Stdio::piped())
-                    .stderr(Stdio::piped());
-                start_child_process(flock_cmd, FLOCK_PATH.as_str()).await?
+                if no_uv_install {
+                    let mut flock_cmd = Command::new(FLOCK_PATH.as_str());
+                    flock_cmd
+                        .env_clear()
+                        .envs(PROXY_ENVS.clone())
+                        .envs(envs)
+                        .args([
+                            "-x",
+                            &format!(
+                                "{}/{}-{}.lock",
+                                LOCK_CACHE_DIR,
+                                if no_uv_install { "pip" } else { "py311" },
+                                fssafe_req
+                            ),
+                            "--command",
+                            &command_args.join(" "),
+                        ])
+                        .stdout(Stdio::piped())
+                        .stderr(Stdio::piped());
+                    start_child_process(flock_cmd, FLOCK_PATH.as_str()).await?
+                } else {
+                    let mut cmd = Command::new(command_args[0]);
+                    cmd.env_clear()
+                        .envs(PROXY_ENVS.clone())
+                        .envs(envs)
+                        .args(&command_args[1..])
+                        .stdout(Stdio::piped())
+                        .stderr(Stdio::piped());
+                    start_child_process(cmd, UV_PATH.as_str()).await?
+                }
             }
 
             #[cfg(windows)]