2025-11-24 Fred Gleason <fredg@paravelsystems.com>

* Fixed a regression in rdimport(1) that could cause imports to
	get hung up when using dropbox mode without the '--delete-source'
	flag set.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2025-11-24 11:55:26 -05:00
parent 55d2e75256
commit be100ce7b6
2 changed files with 6 additions and 2 deletions

View File

@@ -25067,3 +25067,7 @@
date-time columns in the cart library. date-time columns in the cart library.
2025-10-23 Fred Gleason <fredg@paravelsystems.com> 2025-10-23 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 4.4.1int0. * Incremented the package version to 4.4.1int0.
2025-11-24 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdimport(1) that could cause imports to
get hung up when using dropbox mode without the '--delete-source'
flag set.

View File

@@ -2386,7 +2386,7 @@ QDateTime MainObject::GetCachedTimestamp(const QString &filename)
QString sql; QString sql;
RDSqlQuery *q; RDSqlQuery *q;
QDateTime dt; QDateTime dt;
if(import_persistent_dropbox_id<0) { if(import_delete_source) {
return dt; return dt;
} }
sql=QString::asprintf("select `FILE_DATETIME` from `DROPBOX_PATHS` where ")+ sql=QString::asprintf("select `FILE_DATETIME` from `DROPBOX_PATHS` where ")+
@@ -2406,7 +2406,7 @@ void MainObject::WriteTimestampCache(const QString &filename,
{ {
QString sql; QString sql;
if(import_persistent_dropbox_id<0) { if(import_delete_source) {
return; return;
} }
if(GetCachedTimestamp(filename).isNull()) { if(GetCachedTimestamp(filename).isNull()) {