Fix the PYAPP_DISTRIBUTION_PATH_PREFIX option

ofek · May 15, 2024 · 383ce8c · 383ce8c
1 parent d2799ae
commit 383ce8c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/build.rs b/build.rs
@@ -628,7 +628,19 @@ fn set_python_path(distribution_source: &str) {
 
     let path_prefix = env::var("PYAPP_DISTRIBUTION_PATH_PREFIX").unwrap_or_default();
     if !path_prefix.is_empty() {
-        relative_path = normalize_relative_path(&path_prefix);
+        if on_windows {
+            relative_path = format!(
+                r"{}\{}",
+                normalize_relative_path(&path_prefix),
+                relative_path
+            );
+        } else {
+            relative_path = format!(
+                "{}/{}",
+                normalize_relative_path(&path_prefix),
+                relative_path
+            );
+        }
     }
     set_runtime_variable(distribution_variable, &relative_path);
 
@@ -687,7 +699,19 @@ fn set_site_packages_path(distribution_source: &str) {
 
     let path_prefix = env::var("PYAPP_DISTRIBUTION_PATH_PREFIX").unwrap_or_default();
     if !path_prefix.is_empty() {
-        relative_path = normalize_relative_path(&path_prefix);
+        if on_windows {
+            relative_path = format!(
+                r"{}\{}",
+                normalize_relative_path(&path_prefix),
+                relative_path
+            );
+        } else {
+            relative_path = format!(
+                "{}/{}",
+                normalize_relative_path(&path_prefix),
+                relative_path
+            );
+        }
     }
     set_runtime_variable(distribution_variable, &relative_path);
 

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
+***Fixed:***
+
+- Fix the `PYAPP_DISTRIBUTION_PATH_PREFIX` option
+
 ## 0.21.0 - 2024-05-15
 
 ***Added:***