From f67579708baf4b9ff1f9a21ae80e1eb22e42b1ae Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Tue, 2 Sep 2025 14:19:58 -0700
Subject: [PATCH] Revert cargo home location

---
 CHANGELOG.md      |  9 ++++++++-
 relenv/common.py  |  2 +-
 relenv/runtime.py | 10 +++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7577c51..64941872 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,17 @@
+0.20.6
+======
+
+* Revert relenv's cargo home from temp directory back to relenv's data
+  directory.
+
+
 0.20.5
 ======
 
 * Update gdbm from 1.25 to 1.26
 * Update libffi from 3.5.1 to 3.5.2
 * Update readline from 8.2.13 to 8.3
-* Update sqlite from 3.50.2 to 3.50.4 
+* Update sqlite from 3.50.2 to 3.50.4
 
 
 0.20.4
diff --git a/relenv/common.py b/relenv/common.py
index 7b5200f8..26a319b7 100644
--- a/relenv/common.py
+++ b/relenv/common.py
@@ -18,7 +18,7 @@
 import time
 
 # relenv package version
-__version__ = "0.20.5"
+__version__ = "0.20.6"
 
 MODULE_DIR = pathlib.Path(__file__).resolve().parent
 
diff --git a/relenv/runtime.py b/relenv/runtime.py
index 500da60e..cfc3f50a 100644
--- a/relenv/runtime.py
+++ b/relenv/runtime.py
@@ -613,7 +613,7 @@ def wrapper(*args, **kwargs):
                 return func(*args, **kwargs)
             base_dir = common().DATA_DIR / "toolchain"
             toolchain = base_dir / common().get_triplet()
-            cargo_home = install_cargo_config.tmpdir.name
+            cargo_home = str(common().DATA_DIR / "cargo")
             if not toolchain.exists():
                 debug("Unable to set CARGO_HOME no toolchain exists")
             else:
@@ -844,13 +844,9 @@ def install_cargo_config():
     # We need this as a late import for python < 3.12 becuase importing it will
     # load the ssl module. Causing out setup_openssl method to fail to load
     # fips module.
-    import tempfile
-
-    install_cargo_config.tmpdir = tempfile.TemporaryDirectory(prefix="relenvcargo")
-    cargo_home = pathlib.Path(install_cargo_config.tmpdir.name)
-
+    dirs = common().work_dirs()
     triplet = common().get_triplet()
-    # dirs = common().work_dirs()
+    cargo_home = dirs.data / "cargo"
 
     toolchain = common().get_toolchain()
     if not toolchain: