accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2025-01-10 00:37:51 +00:00
Code Issues Releases Activity

Merge branch 'staging' into v5.x

Browse Source
This commit is contained in:
Gavin D'souza 2022-08-03 16:50:38 +05:30
commit 155524b769
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.releaserc
View File

@ -5,7 +5,7 @@
"@semantic-release/release-notes-generator",
[
"@semantic-release/exec", {
"prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" bench/__init__.py'
"prepareCmd": 'sed -ir -E "s/\"[0-9]+\.[0-9]+\.[0-9]+\"/\"${nextRelease.version}\"/" bench/__init__.py'
}
],
[

1
bench/patches/v5/fix_user_permissions.py
View File

@ -13,6 +13,7 @@ from bench.utils import exec_cmd, get_bench_name, get_cmd_output
def is_sudoers_set():
"""Check if bench sudoers is set"""
cmd = ["sudo", "-n", "bench"]
bench_warn = False
with open(os.devnull, "wb") as f:
return_code_check = not subprocess.call(cmd, stdout=f)

9
bench/utils/__init__.py
View File

@ -63,9 +63,10 @@ def is_valid_frappe_branch(frappe_path: str, frappe_branch: str):
:type frappe_branch: str
:raises InvalidRemoteException: branch for this repo doesn't exist
"""
import git
from git.cmd import Git
from git.exc import GitCommandError
g = git.cmd.Git()
g = Git()
if frappe_branch:
try:
@ -74,8 +75,8 @@ def is_valid_frappe_branch(frappe_path: str, frappe_branch: str):
raise InvalidRemoteException(
f"Invalid branch or tag: {frappe_branch} for the remote {frappe_path}"
)
except git.exc.GitCommandError:
raise InvalidRemoteException(f"Invalid frappe path: {frappe_path}")
except GitCommandError as e:
raise InvalidRemoteException(f"Invalid frappe path: {frappe_path}") from e
def log(message, level=0, no_log=False):

5
bench/utils/bench.py
View File

@ -280,7 +280,7 @@ def restart_supervisor_processes(bench_path=".", web_workers=False):
sudo = ""
try:
supervisor_status = get_cmd_output("supervisorctl status", cwd=bench_path)
except Exception as e:
except subprocess.CalledProcessError as e:
if e.returncode == 127:
log("restart failed: Couldn't find supervisorctl in PATH", level=3)
return
@ -385,7 +385,6 @@ def update(
from bench.bench import Bench
from bench.config.common_site_config import update_config
from bench.exceptions import CannotUpdateReleaseBench
from bench.utils import clear_command_cache
from bench.utils.app import is_version_upgrade
from bench.utils.system import backup_all_sites
@ -394,8 +393,6 @@ def update(
patches.run(bench_path=bench_path)
conf = bench.conf
clear_command_cache(bench_path=".")
if conf.get("release_bench"):
raise CannotUpdateReleaseBench("Release bench detected, cannot update!")