Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes formatting error in executor (duplicate 'name' and duplicate quotes) #476

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+5 −5
Open

Fixes formatting error in executor (duplicate 'name' and duplicate quotes) #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
545e19d
Exclude "com.apple.quicklook.thumbnail" (#475)
ClementKunz Jan 17, 2025
c1bd4de
Fixes formatting error in executor (duplicate 'name' and duplicate qu…
luc-guyot-infomaniak Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions extensions/MacOSX/kDriveLiteSync/Extension/xpcService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ - (void)initOpenBlackListSet
@"com.apple.QuickLookThumbnailing.extension.ThumbnailExtension-macOS", // QuickLookThumbnailing
@"com.apple.quicklook.thumbnail.ImageExtension", // Quicklook Thumbnail
@"com.apple.quicklook.thumbnail.AudiovisualExtension", // Quicklook Thumbnail
@"com.apple.quicklook.thumbnail", // Quicklook Thumbnail
@"com.apple.Terminal", // Terminal
@"com.apple.system_profiler", // System profiler
@"com.apple.path_helper", // help manage the PATH environment variable,
Expand Down
9 changes: 4 additions & 5 deletions src/libsyncengine/propagation/executor/executorworker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,11 +299,10 @@ void ExecutorWorker::logCorrespondingNodeErrorMsg(const SyncOpPtr syncOp) {
const std::wstring mainMsg = L"Error in UpdateTree::deleteNode: ";
if (syncOp->correspondingNode()) {
const auto nodeName = Utility::formatSyncName(syncOp->correspondingNode()->name());
LOGW_SYNCPAL_WARN(_logger, mainMsg << L"correspondingNode name=" << L"'" << nodeName << L"'.");
LOGW_SYNCPAL_WARN(_logger, mainMsg << L"correspondingNode " << nodeName);
} else {
const auto nodeName = Utility::formatSyncName(syncOp->affectedNode()->name());
LOGW_SYNCPAL_WARN(_logger,
mainMsg << L"correspondingNode is nullptr, former affectedNode name=" << L"'" << nodeName << L"'.");
LOGW_SYNCPAL_WARN(_logger, mainMsg << L"correspondingNode is nullptr, former affectedNode " << nodeName);
}
}

Expand Down Expand Up @@ -1857,12 +1856,12 @@ ExitInfo ExecutorWorker::propagateConflictToDbAndTree(SyncOpPtr syncOp, bool &pr
}
// Remove node from update tree
if (!_syncPal->updateTree(ReplicaSide::Local)->deleteNode(syncOp->conflict().localNode())) {
LOGW_SYNCPAL_WARN(_logger, L"Error in UpdateTree::deleteNode: node name="
LOGW_SYNCPAL_WARN(_logger, L"Error in UpdateTree::deleteNode: node "
<< Utility::formatSyncName(syncOp->conflict().localNode()->name()));
}

if (!_syncPal->updateTree(ReplicaSide::Remote)->deleteNode(syncOp->conflict().remoteNode())) {
LOGW_SYNCPAL_WARN(_logger, L"Error in UpdateTree::deleteNode: node name="
LOGW_SYNCPAL_WARN(_logger, L"Error in UpdateTree::deleteNode: node "
<< Utility::formatSyncName(syncOp->conflict().remoteNode()->name()));
}

Expand Down
Loading