Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion relenv/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import time

# relenv package version
__version__ = "0.20.5"
__version__ = "0.20.6"

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

Expand Down
10 changes: 3 additions & 7 deletions relenv/runtime.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Loading