From 197d180cb95df97cbdf29437c5bebecee521a52b Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Tue, 22 Apr 2014 16:17:39 +0200 Subject: [PATCH] Propagator: Add support for CSYNC_CONFLICT_FILE_USERNAME --- src/mirall/propagator_qnam.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/mirall/propagator_qnam.cpp b/src/mirall/propagator_qnam.cpp index 436515446f..825acb9b96 100644 --- a/src/mirall/propagator_qnam.cpp +++ b/src/mirall/propagator_qnam.cpp @@ -534,7 +534,14 @@ QString makeConflictFileName(QString &fn, QDateTime dt) dotLocation = conflictFileName.size(); } QString timeString = dt.toString("yyyyMMdd-hhmmss"); - conflictFileName.insert(dotLocation, "_conflict-" + timeString); + + // Additional marker + QByteArray conflictFileUserName = qgetenv("CSYNC_CONFLICT_FILE_USERNAME"); + if (conflictFileUserName.isEmpty()) + conflictFileName.insert(dotLocation, "_conflict-" + timeString); + else + conflictFileName.insert(dotLocation, "_conflict_" + QString::fromUtf8(conflictFileUserName) + "-" + timeString); + return conflictFileName; }