2021-07-08 Fred Gleason <fredg@paravelsystems.com>

* Fixed a regression in rdimport(1) that caused it to repeatedly
	re-import files in dropbox mode when the '--delete-source' switch
	was set.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-07-08 14:09:56 -04:00
parent 2f1e4ba41f
commit 2eebe72877
2 changed files with 6 additions and 1 deletions

View File

@ -22026,3 +22026,7 @@
2021-07-08 Fred Gleason <fredg@paravelsystems.com>
* Modified rdservice(8) to log the startup command-line for all
dropboxes at DEBUG priority.
2021-07-08 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdimport(1) that caused it to repeatedly
re-import files in dropbox mode when the '--delete-source' switch
was set.

View File

@ -1520,7 +1520,8 @@ void MainObject::VerifyFile(const QString &filename,unsigned *cartnum)
found=true;
QFileInfo *file=new QFileInfo(filename);
dt=GetCachedTimestamp(filename);
if(dt.isNull()||(file->lastModified()>dt)) {
if(dt.isNull()||
(file->lastModified().toSecsSinceEpoch()>dt.toSecsSinceEpoch())) {
if((file->size()==(*ci)->size)&&(!(*ci)->failed)) {
(*ci)->pass++;
}