daylin/viv
1
0
Fork 0
mirror of https://github.com/daylinmorgan/viv.git synced 2024-12-22 10:40:44 -06:00
Code Issues Projects Releases Packages Wiki Activity

fix: correctly use exisiting env

Browse source
This commit is contained in:
Daylin Morgan 2023-08-10 11:01:48 -05:00
parent 6b48e8c5f1
commit 78b3cf817a
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/viv/viv.py
View file

@ -55,7 +55,7 @@ from typing import (
from urllib.error import HTTPError from urllib.error import HTTPError
from urllib.request import urlopen from urllib.request import urlopen
__version__ = "23.8a3-10-g505e79f-dev" __version__ = "23.8a3-11-g6b48e8c-dev"
class Spinner: class Spinner:
@ -969,6 +969,8 @@ class ViVenv:
run_mode = Env().viv_run_mode run_mode = Env().viv_run_mode
_path = self.path _path = self.path
try: try:
if self.loaded:
yield
if keep or run_mode == "persist": if keep or run_mode == "persist":
yield yield
elif run_mode == "ephemeral": elif run_mode == "ephemeral":
@ -1734,18 +1736,18 @@ class Viv:
_, bin = self._pick_bin(reqs, bin) _, bin = self._pick_bin(reqs, bin)
vivenv = ViVenv(spec) vivenv = ViVenv(spec)
if not vivenv.loaded or Env().viv_force: with vivenv.use(keep=keep):
with vivenv.use(keep=keep): if not vivenv.loaded or Env().viv_force:
vivenv.create() vivenv.create()
vivenv.install_pkgs() vivenv.install_pkgs()
vivenv.bin_exists(bin) vivenv.bin_exists(bin)
# TODO: refactor this logic elsewhere # TODO: refactor this logic elsewhere
if keep or Env().run_mode != "ephemeral": if keep or Env().run_mode != "ephemeral":
vivenv.touch() vivenv.touch()
vivenv.meta.write(vivenv.path / "vivmeta.json") vivenv.meta.write(vivenv.path / "vivmeta.json")
subprocess_run_quit([vivenv.path / "bin" / bin, *rest]) subprocess_run_quit([vivenv.path / "bin" / bin, *rest])
class Arg: class Arg: