Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-13 08:19:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix quiet option for Merge (CLI) (#2695)

Browse Source
This commit is contained in:
louib 2019-02-15 08:56:29 -05:00 committed by Jonathan White
parent 8cf3ee866e
commit fa3c959212
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cli/Merge.cpp
View File

@ -78,7 +78,10 @@ int Merge::execute(const QStringList& arguments)
QSharedPointer<Database> db2; QSharedPointer<Database> db2;
if (!parser.isSet("same-credentials")) { if (!parser.isSet("same-credentials")) {
db2 = Utils::unlockDatabase(args.at(1), parser.value(keyFileFromOption), Utils::STDOUT, Utils::STDERR); db2 = Utils::unlockDatabase(args.at(1),
parser.value(keyFileFromOption),
parser.isSet(Command::QuietOption) ? Utils::DEVNULL : Utils::STDOUT,
Utils::STDERR);
if (!db2) { if (!db2) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }

8
tests/TestCli.cpp
View File

@ -883,6 +883,14 @@ void TestCli::testMerge()
mergeCmd.execute({"merge", "-q", "-s", sourceFile.fileName(), sourceFile.fileName()}); mergeCmd.execute({"merge", "-q", "-s", sourceFile.fileName(), sourceFile.fileName()});
m_stdoutFile->seek(pos); m_stdoutFile->seek(pos);
QCOMPARE(m_stdoutFile->readAll(), QByteArray("")); QCOMPARE(m_stdoutFile->readAll(), QByteArray(""));
// Quiet option without the -s option
pos = m_stdoutFile->pos();
Utils::Test::setNextPassword("a");
Utils::Test::setNextPassword("a");
mergeCmd.execute({"merge", "-q", sourceFile.fileName(), sourceFile.fileName()});
m_stdoutFile->seek(pos);
QCOMPARE(m_stdoutFile->readAll(), QByteArray(""));
} }
void TestCli::testRemove() void TestCli::testRemove()