Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-09-17 17:00:27 +02:00
Code Issues Projects Releases Wiki Activity

Added display of warnings from rddbmgr(8) to rddbconfig(8).

Browse Source
This commit is contained in:
Patrick Linstruth 2018-10-30 09:21:17 -07:00
parent 4f8a5278fd
commit 636f185202
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -17894,3 +17894,5 @@
2018-10-23 Fred Gleason <fredg@paravelsystems.com> 2018-10-23 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'configure.ac' that caused detection of FLAC * Fixed a bug in 'configure.ac' that caused detection of FLAC
support to always fail. support to always fail.
2018-10-30 Patrick Linstruth <patrick@deltecent.com>
* Added display of warnings from rddbmgr(8) to rddbconfig(8).

16
utils/rddbconfig/rddbconfig.cpp
View File

@ -189,14 +189,22 @@ void MainWidget::mismatchData()
modifyProcess.start("rddbmgr", args); modifyProcess.start("rddbmgr", args);
modifyProcess.waitForFinished(-1); modifyProcess.waitForFinished(-1);
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
QString stderr=modifyProcess.readAllStandardError();
if (modifyProcess.exitCode()) { if (modifyProcess.exitCode()) {
QMessageBox::critical(this,tr("RDDbConfig Error"), QMessageBox::critical(this,tr("RDDbConfig Error"),stderr);
QString(modifyProcess.readAllStandardError()));
} }
else { else {
QMessageBox::information(this,"Database Modified Successfully", if(!stderr.isEmpty()) {
QMessageBox::information(this,"Database Modified with Warnings",
QString().sprintf("Modified database to version %d with warnings:\n\n%s",
RD_VERSION_DATABASE,(const char *)stderr));
}
else {
QMessageBox::information(this,"Database Modified Successfully",
QString().sprintf("Modified database to version %d", RD_VERSION_DATABASE));
}
rd_config->log("rddbconfig",RDConfig::LogInfo,
QString().sprintf("Modified database to version %d", RD_VERSION_DATABASE)); QString().sprintf("Modified database to version %d", RD_VERSION_DATABASE));
rd_config->log("rddbconfig",RDConfig::LogInfo,QString().sprintf("Modified database to version %d", RD_VERSION_DATABASE));
emit dbChanged(); emit dbChanged();
} }