From 84b853dca8c229532bc9b5dd26c7eb4cb0ae5dc1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 7 Sep 2017 20:38:54 +0530 Subject: [PATCH] Output the actual command used for the linux native dialogs in debug mode --- src/calibre/gui2/linux_file_dialogs.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/linux_file_dialogs.py b/src/calibre/gui2/linux_file_dialogs.py index e539f4a08b..4e53f015d2 100644 --- a/src/calibre/gui2/linux_file_dialogs.py +++ b/src/calibre/gui2/linux_file_dialogs.py @@ -14,7 +14,7 @@ from threading import Thread from PyQt5.Qt import QEventLoop from calibre import force_unicode -from calibre.constants import filesystem_encoding, preferred_encoding +from calibre.constants import filesystem_encoding, preferred_encoding, DEBUG from calibre.utils.config import dynamic @@ -107,7 +107,13 @@ def decode_output(raw): def run(cmd): from calibre.gui2 import sanitize_env_vars with sanitize_env_vars(): - p = subprocess.Popen(list(map(encode_arg, cmd)), stdout=subprocess.PIPE, stderr=subprocess.PIPE) + ecmd = list(map(encode_arg, cmd)) + if DEBUG: + try: + print(ecmd) + except Exception: + pass + p = subprocess.Popen(ecmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = p.communicate() ret = p.wait() return ret, decode_output(stdout), decode_output(stderr)