jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove obsolete read only state from database. (#7324)

Browse Source
This commit is contained in:
Patrick Klein
2022-01-29 03:26:53 +01:00
committed by GitHub
parent c914c116e4
commit bce8c84c26
13 changed files with 28 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/Merge.cpp
View File

@@ -80,7 +80,7 @@ int Merge::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer
} else {
db2 = QSharedPointer<Database>::create();
QString errorMessage;
if (!db2->open(fromDatabasePath, database->key(), &errorMessage, false)) {
if (!db2->open(fromDatabasePath, database->key(), &errorMessage)) {
err << QObject::tr("Error reading merge file:\n%1").arg(errorMessage);
return EXIT_FAILURE;
}

2
src/cli/Utils.cpp
View File

@@ -182,7 +182,7 @@ namespace Utils
auto db = QSharedPointer<Database>::create();
QString error;
if (db->open(databaseFilename, compositeKey, &error, false)) {
if (db->open(databaseFilename, compositeKey, &error)) {
return db;
} else {
err << error << endl;