[Pkg-owncloud-commits] [owncloud-client] 55/103: Propagator: Add support for CSYNC_CONFLICT_FILE_USERNAME

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 197d180cb95df97cbdf29437c5bebecee521a52b
Author: Markus Goetz <markus at woboq.com>
Date:   Tue Apr 22 16:17:39 2014 +0200

    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 4365154..825acb9 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;
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git