gnucash maint: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Fri Jul 6 15:24:52 EDT 2018
Updated via https://github.com/Gnucash/gnucash/commit/49bd9c41 (commit)
via https://github.com/Gnucash/gnucash/commit/9ab06bc9 (commit)
via https://github.com/Gnucash/gnucash/commit/240c4bd2 (commit)
from https://github.com/Gnucash/gnucash/commit/04424b62 (commit)
commit 49bd9c41c4fc0f2635a0164f36d5651c645d34fd
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Jul 6 21:24:44 2018 +0200
Rename confusing directory
diff --git a/contrib/art/gnucash-bugzilla-favicon/android-chrome-192x192.png b/contrib/art/gnucash-bugzilla-favicons/android-chrome-192x192.png
similarity index 100%
rename from contrib/art/gnucash-bugzilla-favicon/android-chrome-192x192.png
rename to contrib/art/gnucash-bugzilla-favicons/android-chrome-192x192.png
diff --git a/contrib/art/gnucash-bugzilla-favicon/android-chrome-512x512.png b/contrib/art/gnucash-bugzilla-favicons/android-chrome-512x512.png
similarity index 100%
rename from contrib/art/gnucash-bugzilla-favicon/android-chrome-512x512.png
rename to contrib/art/gnucash-bugzilla-favicons/android-chrome-512x512.png
diff --git a/contrib/art/gnucash-bugzilla-favicon/apple-touch-icon.png b/contrib/art/gnucash-bugzilla-favicons/apple-touch-icon.png
similarity index 100%
rename from contrib/art/gnucash-bugzilla-favicon/apple-touch-icon.png
rename to contrib/art/gnucash-bugzilla-favicons/apple-touch-icon.png
diff --git a/contrib/art/gnucash-bugzilla-favicon/browserconfig.xml b/contrib/art/gnucash-bugzilla-favicons/browserconfig.xml
similarity index 100%
rename from contrib/art/gnucash-bugzilla-favicon/browserconfig.xml
rename to contrib/art/gnucash-bugzilla-favicons/browserconfig.xml
diff --git a/contrib/art/gnucash-bugzilla-favicon/favicon-16x16.png b/contrib/art/gnucash-bugzilla-favicons/favicon-16x16.png
similarity index 100%
rename from contrib/art/gnucash-bugzilla-favicon/favicon-16x16.png
rename to contrib/art/gnucash-bugzilla-favicons/favicon-16x16.png
diff --git a/contrib/art/gnucash-bugzilla-favicon/favicon-32x32.png b/contrib/art/gnucash-bugzilla-favicons/favicon-32x32.png
similarity index 100%
rename from contrib/art/gnucash-bugzilla-favicon/favicon-32x32.png
rename to contrib/art/gnucash-bugzilla-favicons/favicon-32x32.png
diff --git a/contrib/art/gnucash-bugzilla-favicon/favicon.ico b/contrib/art/gnucash-bugzilla-favicons/favicon.ico
similarity index 100%
rename from contrib/art/gnucash-bugzilla-favicon/favicon.ico
rename to contrib/art/gnucash-bugzilla-favicons/favicon.ico
diff --git a/contrib/art/gnucash-bugzilla-favicon/mstile-150x150.png b/contrib/art/gnucash-bugzilla-favicons/mstile-150x150.png
similarity index 100%
rename from contrib/art/gnucash-bugzilla-favicon/mstile-150x150.png
rename to contrib/art/gnucash-bugzilla-favicons/mstile-150x150.png
diff --git a/contrib/art/gnucash-bugzilla-favicon/safari-pinned-tab.svg b/contrib/art/gnucash-bugzilla-favicons/safari-pinned-tab.svg
similarity index 100%
rename from contrib/art/gnucash-bugzilla-favicon/safari-pinned-tab.svg
rename to contrib/art/gnucash-bugzilla-favicons/safari-pinned-tab.svg
diff --git a/contrib/art/gnucash-bugzilla-favicon/site.webmanifest b/contrib/art/gnucash-bugzilla-favicons/site.webmanifest
similarity index 100%
rename from contrib/art/gnucash-bugzilla-favicon/site.webmanifest
rename to contrib/art/gnucash-bugzilla-favicons/site.webmanifest
commit 9ab06bc9b3acc71e5e8423a6aa7278c0b83e3991
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Jul 5 22:29:16 2018 +0200
Bug 789594 - Unable to overwrite sqlite3 database file
diff --git a/libgnucash/backend/dbi/gnc-backend-dbi.cpp b/libgnucash/backend/dbi/gnc-backend-dbi.cpp
index b2e4ab6..e00c22e 100644
--- a/libgnucash/backend/dbi/gnc-backend-dbi.cpp
+++ b/libgnucash/backend/dbi/gnc-backend-dbi.cpp
@@ -403,13 +403,18 @@ GncDbiBackend<DbType::DBI_SQLITE>::session_begin(QofSession* session,
return;
}
- if (create && !force && file_exists)
+ if (create && file_exists)
{
- set_error (ERR_BACKEND_STORE_EXISTS);
- auto msg = "Might clobber, no force";
- PWARN ("%s", msg);
- LEAVE("Error");
- return;
+ if (!force)
+ {
+ set_error (ERR_BACKEND_STORE_EXISTS);
+ auto msg = "Might clobber, no force";
+ PWARN ("%s", msg);
+ LEAVE("Error");
+ return;
+ }
+ else
+ g_unlink (filepath.c_str());
}
connect(nullptr);
commit 240c4bd2cff9195a7dbdbcd8dba573bea236b3da
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Jul 5 16:01:20 2018 +0200
Whitespace cosmetics
diff --git a/libgnucash/backend/dbi/gnc-backend-dbi.cpp b/libgnucash/backend/dbi/gnc-backend-dbi.cpp
index 4017066..b2e4ab6 100644
--- a/libgnucash/backend/dbi/gnc-backend-dbi.cpp
+++ b/libgnucash/backend/dbi/gnc-backend-dbi.cpp
@@ -160,16 +160,15 @@ UriStrings::UriStrings(const std::string& uri)
m_host = std::string{host};
m_dbname = std::string{dbname};
if (username)
- m_username = std::string{username};
+ m_username = std::string{username};
if (password)
- m_password = std::string{password};
+ m_password = std::string{password};
m_portnum = portnum;
g_free(protocol);
g_free(host);
g_free(username);
g_free(password);
g_free(dbname);
-
}
std::string
@@ -275,7 +274,7 @@ GncDbiBackend<Type>::conn_setup (PairVec& options, UriStrings& uri)
{
PERR ("Unable to create %s dbi connection", dbstr);
set_error (ERR_BACKEND_BAD_URL);
- return nullptr;
+ return nullptr;
}
dbi_conn_error_handler (conn, error_handler<Type>, this);
@@ -401,7 +400,7 @@ GncDbiBackend<DbType::DBI_SQLITE>::session_begin(QofSession* session,
set_message (msg + filepath + " not found");
PWARN ("Sqlite3 file %s not found", filepath.c_str());
LEAVE("Error");
- return;
+ return;
}
if (create && !force && file_exists)
@@ -410,7 +409,7 @@ GncDbiBackend<DbType::DBI_SQLITE>::session_begin(QofSession* session,
auto msg = "Might clobber, no force";
PWARN ("%s", msg);
LEAVE("Error");
- return;
+ return;
}
connect(nullptr);
@@ -438,7 +437,7 @@ GncDbiBackend<DbType::DBI_SQLITE>::session_begin(QofSession* session,
PERR ("Unable to connect to %s: %d\n", book_id, result);
set_error (ERR_BACKEND_BAD_URL);
LEAVE("Error");
- return;
+ return;
}
if (!conn_test_dbi_library(conn))
@@ -570,10 +569,10 @@ adjust_sql_options (dbi_conn connection)
{
const char* errmsg;
int err = dbi_conn_error(connection, &errmsg);
- if (err)
- PERR("Unable to get sql_mode %d : %s", err, errmsg);
- else
- PINFO("Sql_mode isn't set.");
+ if (err)
+ PERR("Unable to get sql_mode %d : %s", err, errmsg);
+ else
+ PINFO("Sql_mode isn't set.");
return;
}
PINFO("Initial sql_mode: %s", str.c_str());
Summary of changes:
.../android-chrome-192x192.png | Bin
.../android-chrome-512x512.png | Bin
.../apple-touch-icon.png | Bin
.../browserconfig.xml | 0
.../favicon-16x16.png | Bin
.../favicon-32x32.png | Bin
.../favicon.ico | Bin
.../mstile-150x150.png | Bin
.../safari-pinned-tab.svg | 0
.../site.webmanifest | 0
libgnucash/backend/dbi/gnc-backend-dbi.cpp | 36 ++++++++++++---------
11 files changed, 20 insertions(+), 16 deletions(-)
rename contrib/art/{gnucash-bugzilla-favicon => gnucash-bugzilla-favicons}/android-chrome-192x192.png (100%)
rename contrib/art/{gnucash-bugzilla-favicon => gnucash-bugzilla-favicons}/android-chrome-512x512.png (100%)
rename contrib/art/{gnucash-bugzilla-favicon => gnucash-bugzilla-favicons}/apple-touch-icon.png (100%)
rename contrib/art/{gnucash-bugzilla-favicon => gnucash-bugzilla-favicons}/browserconfig.xml (100%)
rename contrib/art/{gnucash-bugzilla-favicon => gnucash-bugzilla-favicons}/favicon-16x16.png (100%)
rename contrib/art/{gnucash-bugzilla-favicon => gnucash-bugzilla-favicons}/favicon-32x32.png (100%)
rename contrib/art/{gnucash-bugzilla-favicon => gnucash-bugzilla-favicons}/favicon.ico (100%)
rename contrib/art/{gnucash-bugzilla-favicon => gnucash-bugzilla-favicons}/mstile-150x150.png (100%)
rename contrib/art/{gnucash-bugzilla-favicon => gnucash-bugzilla-favicons}/safari-pinned-tab.svg (100%)
rename contrib/art/{gnucash-bugzilla-favicon => gnucash-bugzilla-favicons}/site.webmanifest (100%)
More information about the gnucash-changes
mailing list