Skip to content

Commit 70d0f92

Browse files
committed
Merge remote-tracking branch 'upstream/staging' into v5.x
* upstream/staging: fix: `pyenv` wasn't defined within `_install_app` scope Signed-off-by: Akhil Narang <[email protected]>
2 parents 30ebca2 + 9714689 commit 70d0f92

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

bench/utils/bench.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ def migrate_env(python, backup=False):
246246
shutil.move(dest, target)
247247

248248
# Create virtualenv using specified python
249-
def _install_app(app):
249+
def _install_app(app, pyenv):
250250
app_path = f"-e {os.path.join('apps', app)}"
251251
if os.environ.get("BENCH_USE_UV"):
252252
exec_cmd(f"uv pip install --upgrade {app_path} --python {pyenv}/bin/python")
@@ -261,10 +261,10 @@ def _install_app(app):
261261
exec_cmd(f"{python} -m venv {pvenv}")
262262

263263
# Install frappe first
264-
_install_app("frappe")
264+
_install_app("frappe", pvenv)
265265
for app in bench.apps:
266266
if str(app) != "frappe":
267-
_install_app(app)
267+
_install_app(app, pvenv)
268268

269269
logger.log(f"Migration Successful to {python}")
270270
except Exception:

0 commit comments

Comments
 (0)