Changeset View
Changeset View
Standalone View
Standalone View
net-mgmt/seafile/files/patch-daemon_repo-mgr.c
--- daemon/repo-mgr.c.orig 2015-01-28 02:18:05.000000000 -0500 | --- daemon/repo-mgr.c.orig 2015-09-21 03:42:11 UTC | ||||
+++ daemon/repo-mgr.c 2015-01-28 02:22:10.000000000 -0500 | +++ daemon/repo-mgr.c | ||||
@@ -2514,13 +2514,13 @@ | @@ -4017,13 +4017,13 @@ checkout_file (const char *repo_id, | ||||
gboolean force_conflict = FALSE; | gboolean force_conflict = FALSE; | ||||
gboolean update_mode_only = FALSE; | gboolean update_mode_only = FALSE; | ||||
Context not available. | |||||
#endif | #endif | ||||
if (!path) | if (!path) | ||||
@@ -2675,13 +2675,13 @@ | @@ -4193,13 +4193,13 @@ checkout_empty_dir (const char *worktree | ||||
char *path; | char *path; | ||||
gboolean case_conflict = FALSE; | gboolean case_conflict = FALSE; | ||||
Context not available. | |||||
#endif | #endif | ||||
if (!path) | if (!path) | ||||
@@ -2839,13 +2839,13 @@ | @@ -4606,13 +4606,13 @@ schedule_file_fetch (GThreadPool *tpool, | ||||
new_ce = TRUE; | |||||
} | |||||
-#ifndef __linux__ | |||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||||
+ path = build_checkout_path (worktree, de->name, strlen(de->name)); | |||||
+#else | |||||
path = build_case_conflict_free_path (worktree, de->name, | |||||
conflict_hash, no_conflict_hash, | |||||
&case_conflict, | |||||
FALSE); | |||||
-#else | |||||
- path = build_checkout_path (worktree, de->name, strlen(de->name)); | |||||
#endif | |||||
if (!path) { | |||||
@@ -4736,13 +4736,13 @@ checkout_file_http (FileTxData *data, | |||||
* A.txt to checkout, we can only detect case conflict after one file is checkecd | |||||
* out. So we need to generate a new one here. | |||||
*/ | |||||
-#ifndef __linux__ | |||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) | |||||
+ path = build_checkout_path (worktree, de->name, strlen(de->name)); | |||||
+#else | |||||
path = build_case_conflict_free_path (worktree, de->name, | |||||
conflict_hash, no_conflict_hash, | |||||
&case_conflict, | |||||
FALSE); | |||||
-#else | |||||
- path = build_checkout_path (worktree, de->name, strlen(de->name)); | |||||
#endif | |||||
if (!path) { | |||||
@@ -5110,13 +5110,13 @@ do_rename_in_worktree (DiffEntry *de, co | |||||
old_path = g_build_filename (worktree, de->name, NULL); | old_path = g_build_filename (worktree, de->name, NULL); | ||||
if (seaf_util_exists (old_path)) { | if (seaf_util_exists (old_path)) { | ||||
Context not available. | |||||
- new_path = build_checkout_path (worktree, de->new_name, strlen(de->new_name)); | - new_path = build_checkout_path (worktree, de->new_name, strlen(de->new_name)); | ||||
#endif | #endif | ||||
if (seaf_util_rename (old_path, new_path) < 0) { | if (!new_path) { | ||||
Context not available. |