From be100ce7b6e463043905c63aa56f76952c3bdbfe Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Mon, 24 Nov 2025 11:55:26 -0500 Subject: [PATCH] 2025-11-24 Fred Gleason * 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 --- ChangeLog | 4 ++++ utils/rdimport/rdimport.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66534709..9fa97a7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25067,3 +25067,7 @@ date-time columns in the cart library. 2025-10-23 Fred Gleason * Incremented the package version to 4.4.1int0. +2025-11-24 Fred Gleason + * Fixed a regression in rdimport(1) that could cause imports to + get hung up when using dropbox mode without the '--delete-source' + flag set. diff --git a/utils/rdimport/rdimport.cpp b/utils/rdimport/rdimport.cpp index 5707cf4c..953ec8d0 100644 --- a/utils/rdimport/rdimport.cpp +++ b/utils/rdimport/rdimport.cpp @@ -2386,7 +2386,7 @@ QDateTime MainObject::GetCachedTimestamp(const QString &filename) QString sql; RDSqlQuery *q; QDateTime dt; - if(import_persistent_dropbox_id<0) { + if(import_delete_source) { return dt; } sql=QString::asprintf("select `FILE_DATETIME` from `DROPBOX_PATHS` where ")+ @@ -2406,7 +2406,7 @@ void MainObject::WriteTimestampCache(const QString &filename, { QString sql; - if(import_persistent_dropbox_id<0) { + if(import_delete_source) { return; } if(GetCachedTimestamp(filename).isNull()) {