From 0d5f2b5d31779abdfb454dcab1aca48964ae07b1 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Fri, 16 Oct 2015 10:05:27 +0200 Subject: [PATCH] Propagator: Reset upload blacklist if a chunk suceeds For #3934 --- src/libsync/propagateupload.cpp | 1 + src/libsync/syncjournaldb.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp index e90fee64d..6d3d29965 100644 --- a/src/libsync/propagateupload.cpp +++ b/src/libsync/propagateupload.cpp @@ -657,6 +657,7 @@ void PropagateUploadFileQNAM::slotPutFinished() pi._chunk = (currentChunk + _startChunk + 1) % _chunkCount ; // next chunk to start with pi._transferid = _transferId; pi._modtime = Utility::qDateTimeFromTime_t(_item->_modtime); + _propagator->_journal->wipeErrorBlacklistEntry(_item->_file); _propagator->_journal->setUploadInfo(_item->_file, pi); _propagator->_journal->commit("Upload info"); startNextChunk(); diff --git a/src/libsync/syncjournaldb.cpp b/src/libsync/syncjournaldb.cpp index 35fa4d649..066598fa9 100644 --- a/src/libsync/syncjournaldb.cpp +++ b/src/libsync/syncjournaldb.cpp @@ -1179,6 +1179,7 @@ void SyncJournalDb::wipeErrorBlacklistEntry( const QString& file ) if( ! query.exec() ) { sqlFail("Deletion of blacklist item failed.", query); } + qDebug() << query.lastQuery() << file; } } -- 2.30.2