# # # patch "src/monotone/MonotoneThread.cpp" # from [8a561f6070b4d66aa7008f0f8410cbfac3db06ed] # to [053f729d2c58a8275ef5fc2a41cb2c643ded6469] # ============================================================ --- src/monotone/MonotoneThread.cpp 8a561f6070b4d66aa7008f0f8410cbfac3db06ed +++ src/monotone/MonotoneThread.cpp 053f729d2c58a8275ef5fc2a41cb2c643ded6469 @@ -314,8 +314,11 @@ void MonotoneThread::run() QByteArray err = process->readAllStandardError(); if (err.size() != 0) { - // FIXME: expand / edit this list further - if (task.getArguments().at(0) != "genkey") + // FIXME: expand this list further or wait for nvm.automate_out_of_band to land + QStringList cmdsWithSpuriousOutput = QStringList() << "genkey" << "select"; + QString cmd = task.getArguments().at(0); + + if (!cmdsWithSpuriousOutput.contains(cmd)) { task.setOutput(err); task.setReturnCode(-1);