gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/88c27c5e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/73063e57 (commit)
	from  https://github.com/Gnucash/gnucash/commit/3e3fc72f (commit)



commit 88c27c5ed305ef95ee9db3365b25e6a9d62d4c03
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sun May 31 11:17:04 2020 -0700

    Make gnucash-cli report errors to stderr by default.

diff --git a/gnucash/gnucash-cli.cpp b/gnucash/gnucash-cli.cpp
index 9d70bc82c..48e68fc5d 100644
--- a/gnucash/gnucash-cli.cpp
+++ b/gnucash/gnucash-cli.cpp
@@ -73,6 +73,9 @@ Gnucash::GnucashCli::parse_command_line (int argc, char **argv)
 {
     Gnucash::CoreApp::parse_command_line (argc, argv);
 
+    if (m_log_to_filename.empty())
+        m_log_to_filename.assign("stderr");
+
     m_add_quotes = m_opt_map["add-price-quotes"].as<bool>();
 
     if (m_opt_map.count ("namespace"))
diff --git a/gnucash/gnucash-core-app.hpp b/gnucash/gnucash-core-app.hpp
index e18575887..4e8926836 100644
--- a/gnucash/gnucash-core-app.hpp
+++ b/gnucash/gnucash-core-app.hpp
@@ -49,6 +49,7 @@ protected:
     std::string m_app_name;
     std::string tagline;
     std::string m_file_to_load;
+    std::string m_log_to_filename;
 
     std::unique_ptr<bpo::options_description> m_opt_desc;
     bpo::variables_map m_opt_map;
@@ -58,7 +59,6 @@ private:
     void add_common_program_options (void);
 
     /* Command-line option variables */
-    std::string m_log_to_filename;
     std::vector <std::string> m_log_flags;
 
     int gnucash_show_version = 0;

commit 73063e5700ab1268803c0463ab2b443edb10964a
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun May 31 10:07:22 2020 -0700

    Provide an error message for ERR_BACKEND_LOCKED.

diff --git a/gnucash/gnucash-commands.cpp b/gnucash/gnucash-commands.cpp
index f01c19ca9..6ac7c3eeb 100644
--- a/gnucash/gnucash-commands.cpp
+++ b/gnucash/gnucash-commands.cpp
@@ -54,9 +54,15 @@ scm_cleanup_and_exit_with_failure (QofSession *session)
 {
     if (session)
     {
-        if (qof_session_get_error (session) != ERR_BACKEND_NO_ERR)
-            PWARN("Session Error: %s\n",
-                     qof_session_get_error_message (session));
+        auto error{qof_session_get_error (session)};
+        if (error != ERR_BACKEND_NO_ERR)
+        {
+            if (error == ERR_BACKEND_LOCKED)
+                PERR ("File is locked, won't open.");
+            else
+                PERR ("Session Error: %s\n",
+                      qof_session_get_error_message (session));
+        }
         qof_session_destroy (session);
     }
     qof_event_resume();
@@ -171,10 +177,7 @@ scm_run_report (void *data,
 
     qof_session_begin (session, datafile, FALSE, FALSE, FALSE);
     if (qof_session_get_error (session) != ERR_BACKEND_NO_ERR)
-    {
-        PERR ("datafile not found, or locked in another session\n");
         scm_cleanup_and_exit_with_failure (session);
-    }
 
     qof_session_load (session, report_session_percentage);
     if (qof_session_get_error (session) != ERR_BACKEND_NO_ERR)



Summary of changes:
 gnucash/gnucash-cli.cpp      |  3 +++
 gnucash/gnucash-commands.cpp | 15 +++++++++------
 gnucash/gnucash-core-app.hpp |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)