Merge lp:~jelmer/brz/auto-path into lp:brz

[Jelmer Vernooij]

Update PYTHONPATH to include local breezy package when running from source.

Update PYTHONPATH to include local breezy package when running from source.

[Martin Packman (gz)]

Looks good. Logic basically being if-exe-has-sibling-dir-named-breezy which seems fine.

review: Approve

=== modified file 'Cargo.toml'
--- Cargo.toml	2021-08-20 14:03:34 +0000
+++ Cargo.toml	2021-11-17 20:21:21 +0000
@@ -12,4 +12,4 @@
 
 [dependencies]
 pkg-version = "1.0.0"
-pyo3 = "0.14.2"
+pyo3 = "0.15.0"

=== modified file 'breezy/main.rs'
--- breezy/main.rs	2021-08-20 14:03:34 +0000
+++ breezy/main.rs	2021-11-17 20:21:21 +0000
@@ -1,6 +1,7 @@
 use pkg_version::*;
 use pyo3::prelude::*;
 use pyo3::types::*;
+use std::path::*;
 
 const MAJOR: u32 = pkg_version_major!();
 const MINOR: u32 = pkg_version_minor!();
@@ -52,6 +53,31 @@
     }
 }
 
+fn prepend_path(py: Python<'_>, el: &Path) -> PyResult<()> {
+    let sys = PyModule::import(py, "sys")?;
+
+    let current_path: &pyo3::types::PyList = sys.getattr("path")?.try_into()?;
+
+    current_path.insert(0, el.to_str().expect("invalid local path"))?;
+
+    Ok(())
+}
+
+// Prepend sys.path with the brz path when useful.
+fn update_path(py: Python<'_>) -> PyResult<()> {
+    let mut path = std::env::current_exe()?;
+
+    path.pop();  // Drop executable name
+
+    let mut package_path = path.clone();
+    package_path.push("breezy");
+    if package_path.is_dir() {
+        prepend_path(py, path.as_path())?;
+    }
+
+    Ok(())
+}
+
 fn posix_setup(py: Python<'_>) -> PyResult<()> {
     let os = PyModule::import(py, "os")?;
 
@@ -72,9 +98,12 @@
 
 fn main() -> PyResult<()> {
     pyo3::prepare_freethreaded_python();
+
     Python::with_gil(|py| {
         posix_setup(py)?;
 
+        update_path(py)?;
+
         check_version(py)?;
 
         let args: Vec<String> = std::env::args().collect();