fix: better exception handling for checking sudoers set

Bloomstack · Mar 19, 2020 · d51311b · d51311b
1 parent 6bb30e3
commit d51311b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/bench/patches/v5/fix_user_permissions.py b/bench/patches/v5/fix_user_permissions.py
@@ -12,7 +12,19 @@
 
 def is_sudoers_set():
 	cmd = ["sudo", "-n", "bench"]
-	return (not subprocess.call(cmd)) or (change_uid_msg in get_cmd_output(cmd, _raise=False))
+
+	with open(os.devnull, "wb") as f:
+		return_code_check = not subprocess.call(cmd, stdout=f)
+
+	if return_code_check:
+		try:
+			bench_warn = change_uid_msg in get_cmd_output(cmd, _raise=False)
+		except Exception:
+			bench_warn = False
+		finally:
+			return_code_check = return_code_check and bench_warn
+
+	return return_code_check
 
 
 def is_production_set(bench_path):

diff --git a/bench/utils.py b/bench/utils.py
@@ -511,6 +511,7 @@ def check_git_for_shallow_clone():
 
 
 def get_cmd_output(cmd, cwd='.', _raise=True):
+	output = ""
 	try:
 		output = subprocess.check_output(cmd, cwd=cwd, shell=True, stderr=subprocess.PIPE).strip()
 	except subprocess.CalledProcessError as e: