From 636f18520204ef5441f7201d296afabb73225716 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Tue, 30 Oct 2018 09:21:17 -0700 Subject: [PATCH] Added display of warnings from rddbmgr(8) to rddbconfig(8). --- ChangeLog | 2 ++ utils/rddbconfig/rddbconfig.cpp | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3953f03..aa9f2a10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17894,3 +17894,5 @@ 2018-10-23 Fred Gleason * Fixed a bug in 'configure.ac' that caused detection of FLAC support to always fail. +2018-10-30 Patrick Linstruth + * Added display of warnings from rddbmgr(8) to rddbconfig(8). diff --git a/utils/rddbconfig/rddbconfig.cpp b/utils/rddbconfig/rddbconfig.cpp index a36820ae..fec12d98 100644 --- a/utils/rddbconfig/rddbconfig.cpp +++ b/utils/rddbconfig/rddbconfig.cpp @@ -189,14 +189,22 @@ void MainWidget::mismatchData() modifyProcess.start("rddbmgr", args); modifyProcess.waitForFinished(-1); QApplication::restoreOverrideCursor(); + QString stderr=modifyProcess.readAllStandardError(); if (modifyProcess.exitCode()) { - QMessageBox::critical(this,tr("RDDbConfig Error"), - QString(modifyProcess.readAllStandardError())); + QMessageBox::critical(this,tr("RDDbConfig Error"),stderr); } 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)); - rd_config->log("rddbconfig",RDConfig::LogInfo,QString().sprintf("Modified database to version %d", RD_VERSION_DATABASE)); emit dbChanged(); }