Skip to content

Commit 42cbe36

Browse files
committed
Revert cargo home location
1 parent 24fc02b commit 42cbe36

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1+
0.20.6
2+
======
3+
4+
* Revert relenv's cargo home from temp directory back to relenv's data
5+
directory.
6+
7+
18
0.20.5
29
======
310

411
* Update gdbm from 1.25 to 1.26
512
* Update libffi from 3.5.1 to 3.5.2
613
* Update readline from 8.2.13 to 8.3
7-
* Update sqlite from 3.50.2 to 3.50.4
14+
* Update sqlite from 3.50.2 to 3.50.4
815

916

1017
0.20.4

relenv/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import time
1919

2020
# relenv package version
21-
__version__ = "0.20.5"
21+
__version__ = "0.20.6"
2222

2323
MODULE_DIR = pathlib.Path(__file__).resolve().parent
2424

relenv/runtime.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ def wrapper(*args, **kwargs):
613613
return func(*args, **kwargs)
614614
base_dir = common().DATA_DIR / "toolchain"
615615
toolchain = base_dir / common().get_triplet()
616-
cargo_home = install_cargo_config.tmpdir.name
616+
cargo_home = str(common().DATA_DIR / "cargo")
617617
if not toolchain.exists():
618618
debug("Unable to set CARGO_HOME no toolchain exists")
619619
else:
@@ -844,13 +844,9 @@ def install_cargo_config():
844844
# We need this as a late import for python < 3.12 becuase importing it will
845845
# load the ssl module. Causing out setup_openssl method to fail to load
846846
# fips module.
847-
import tempfile
848-
849-
install_cargo_config.tmpdir = tempfile.TemporaryDirectory(prefix="relenvcargo")
850-
cargo_home = pathlib.Path(install_cargo_config.tmpdir.name)
851-
847+
dirs = common().work_dirs()
852848
triplet = common().get_triplet()
853-
# dirs = common().work_dirs()
849+
cargo_home = dirs.data / "cargo"
854850

855851
toolchain = common().get_toolchain()
856852
if not toolchain:

0 commit comments

Comments
 (0)