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

Merge branch 'deltecent-issue414'

Browse Source
This commit is contained in:
Fred Gleason 2019-05-31 12:39:40 -04:00
commit e604b4a2c5
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18701,3 +18701,6 @@
background color codes were inaccurate. background color codes were inaccurate.
2019-05-31 Patrick Linstruth <patrick@deltecent.com> 2019-05-31 Patrick Linstruth <patrick@deltecent.com>
* Fixed bug in rdlogmanager(1) deconflicting rules. * Fixed bug in rdlogmanager(1) deconflicting rules.
2019-05-28 Patrick Linstruth <patrick@deltecent.com>
* Added RD_PREFIX to rddbmgr(1) path and process start error
message dialog to rddbconfig(1).

43
utils/rddbconfig/rddbconfig.cpp
View File

@ -28,8 +28,9 @@
#include <qmessagebox.h> #include <qmessagebox.h>
#include <q3filedialog.h> #include <q3filedialog.h>
#include <rdconfig.h> #include "rdconfig.h"
#include <dbversion.h> #include "rdpaths.h"
#include "dbversion.h"
#include "../../icons/rivendell-22x22.xpm" #include "../../icons/rivendell-22x22.xpm"
@ -186,27 +187,33 @@ void MainWidget::mismatchData()
QStringList args; QStringList args;
args << QString("--modify"); args << QString("--modify");
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
modifyProcess.start("rddbmgr", args); modifyProcess.start(QString("%1/sbin/rddbmgr").arg(RD_PREFIX), args);
modifyProcess.waitForFinished(-1); bool r=modifyProcess.waitForFinished(-1);
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
QString stderr=modifyProcess.readAllStandardError(); if(r) {
if (modifyProcess.exitCode()) { QString stderr=modifyProcess.readAllStandardError();
QMessageBox::critical(this,tr("RDDbConfig Error"),stderr); if (modifyProcess.exitCode()) {
} QMessageBox::critical(this,tr("RDDbConfig Error"),stderr);
else {
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 { 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();
}
}
else {
QMessageBox::critical(this,tr("Database Update Error"),
QString("Error starting rddbmgr: code=%1").arg(modifyProcess.error()));
} }
} }