From 267e58a81960fb4cf51a342ef00bbae482157b8a Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Mon, 2 Dec 2024 20:49:11 +0530 Subject: [PATCH] fix: don't prompt users unless we have a TTY This can break automated runs (which earlier worked) Signed-off-by: Akhil Narang --- frappe/database/mariadb/setup_db.py | 2 +- frappe/database/postgres/setup_db.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/database/mariadb/setup_db.py b/frappe/database/mariadb/setup_db.py index 294e6a132d..4cadd9f4c4 100644 --- a/frappe/database/mariadb/setup_db.py +++ b/frappe/database/mariadb/setup_db.py @@ -129,7 +129,7 @@ def get_root_connection(): frappe.flags.root_login = ( frappe.conf.get("mariadb_root_login") or frappe.conf.get("root_login") - or input("Enter mysql super user [root]: ") + or (sys.__stdin__.isatty() and input("Enter mysql super user [root]: ")) or "root" ) diff --git a/frappe/database/postgres/setup_db.py b/frappe/database/postgres/setup_db.py index 4fd797952a..b4369effc7 100644 --- a/frappe/database/postgres/setup_db.py +++ b/frappe/database/postgres/setup_db.py @@ -60,13 +60,14 @@ def import_db_from_sql(source_sql=None, verbose=False): def get_root_connection(): if not frappe.local.flags.root_connection: + import sys from getpass import getpass if not frappe.flags.root_login: frappe.flags.root_login = ( frappe.conf.get("postgres_root_login") or frappe.conf.get("root_login") - or input("Enter postgres super user [postgres]: ") + or (sys.__stdin__.isatty() and input("Enter postgres super user [postgres]: ")) or "postgres" )