Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-31 14:13:52 +01:00
Code Issues Projects Releases Wiki Activity

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason
2019-04-22 16:46:44 -04:00
parent 569aa1c5ba e2e1902127
commit b6ec19aedc
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -18579,3 +18579,6 @@
2019-04-22 Fred Gleason <fredg@paravelsystems.com> 2019-04-22 Fred Gleason <fredg@paravelsystems.com>
* Modified 'rivendell.spec.in' to pin the Python version used on * Modified 'rivendell.spec.in' to pin the Python version used on
RHEL 7 to 3.4. RHEL 7 to 3.4.
2019-04-22 Patrick Linstruth <patrick@deltecent.com>
* Fixed a regression in rdimport(1) that broke the
"--set-daypart-times" argument.

2
utils/rdimport/rdimport.cpp
View File

@@ -244,7 +244,7 @@ MainObject::MainObject(QObject *parent)
} }
rda->cmdSwitch()->setProcessed(i,true); rda->cmdSwitch()->setProcessed(i,true);
} }
if(rda->cmdSwitch()->key(i)=="--set-daypart-times\n") { if(rda->cmdSwitch()->key(i)=="--set-daypart-times") {
QStringList f0=rda->cmdSwitch()->value(i).split(","); QStringList f0=rda->cmdSwitch()->value(i).split(",");
if(f0.size()!=2) { if(f0.size()!=2) {
Log(RDConfig::LogErr,QString("rdimport: invalid argument to --set-daypart-times\n")); Log(RDConfig::LogErr,QString("rdimport: invalid argument to --set-daypart-times\n"));