[Pkg-owncloud-commits] [ocsync] 01/04: Imported Upstream version 0.90.4
Sandro Knauß
hefee-guest at alioth.debian.org
Mon Oct 21 21:02:25 UTC 2013
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository ocsync.
commit 4b09364d34444dee04abf2c58736eff7a5cf1412
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Mon Oct 21 20:31:10 2013 +0200
Imported Upstream version 0.90.4
---
.tag | 2 +-
CMakeLists.txt | 2 +-
ChangeLog | 11 +++++++++++
modules/csync_owncloud.c | 4 ++--
src/csync.c | 17 +++--------------
src/csync_propagate.c | 10 ++++++----
src/csync_update.c | 2 +-
src/httpbf/src/httpbf.c | 10 ++++++----
8 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/.tag b/.tag
index bba4e2b..804f2e7 100644
--- a/.tag
+++ b/.tag
@@ -1 +1 @@
-8f1e318cde86a74873e28ec53c88753d03a7c240
+0f6ca35e9554924ef70fa33f553a343e92cb70e2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4634ef..5b5503d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(APPLICATION_NAME ${PROJECT_NAME})
set(APPLICATION_VERSION_MAJOR "0")
set(APPLICATION_VERSION_MINOR "90")
-set(APPLICATION_VERSION_PATCH "2")
+set(APPLICATION_VERSION_PATCH "4")
set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}")
diff --git a/ChangeLog b/ChangeLog
index 59be24d..c4cca3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
ChangeLog
==========
+version 0.90.4 (released 2013-10-18, ownCloud Client 1.4.2)
+
+ * Count renamed and deleted files for progress information.
+ * Do not reset csync internal error state in helper funcs
+ and do not overwrite error messages.
+ That fixes error reporting to the client.
+ * Disable check on inodes on all platforms as inodes are not
+ reliable.
+ * Fix resuming after user aborting the sync process.
+ * enabled HBF debugging permanently.
+
version 0.90.1 (released 2013-09-24, ownCloud Client 1.4.1)
* no more check on the local inode in updater for win32 (bug #779)
* detect if server does not send an etag after an upload
diff --git a/modules/csync_owncloud.c b/modules/csync_owncloud.c
index cec0e17..568b389 100644
--- a/modules/csync_owncloud.c
+++ b/modules/csync_owncloud.c
@@ -1413,9 +1413,9 @@ static int owncloud_sendfile(csync_vio_method_handle_t *src, csync_vio_method_ha
}
set_errno_from_neon_errcode(neon_stat);
- DEBUG_WEBDAV("Error GET: Neon: %d, errno %d", neon_stat, errno);
+ DEBUG_WEBDAV("Error GET: Neon: %d, errno %d, string %s", neon_stat, errno, dav_session.error_string);
error_code = errno;
- if( status != NULL ) {
+ if( status != NULL && errno != ERRNO_ERROR_STRING ) {
SAFE_FREE(dav_session.error_string);
dav_session.error_string = c_strdup(status->reason_phrase);
}
diff --git a/src/csync.c b/src/csync.c
index 099f584..8b89229 100644
--- a/src/csync.c
+++ b/src/csync.c
@@ -917,7 +917,6 @@ int csync_add_exclude_list(CSYNC *ctx, const char *path) {
if (ctx == NULL || path == NULL) {
return -1;
}
- ctx->error_code = CSYNC_ERR_NONE;
return csync_exclude_load(ctx, path);
}
@@ -931,7 +930,6 @@ const char *csync_get_config_dir(CSYNC *ctx) {
if (ctx == NULL) {
return NULL;
}
- ctx->error_code = CSYNC_ERR_NONE;
return ctx->options.config_dir;
}
@@ -940,7 +938,6 @@ int csync_set_config_dir(CSYNC *ctx, const char *path) {
if (ctx == NULL || path == NULL) {
return -1;
}
- ctx->error_code = CSYNC_ERR_NONE;
SAFE_FREE(ctx->options.config_dir);
ctx->options.config_dir = c_strdup(path);
@@ -959,7 +956,9 @@ int csync_enable_statedb(CSYNC *ctx) {
ctx->error_code = CSYNC_ERR_NONE;
if (ctx->status & CSYNC_STATUS_INIT) {
- ctx->error_code = CSYNC_ERR_UNSPEC;
+ if (ctx->error_code == CSYNC_ERR_NONE) {
+ ctx->error_code = CSYNC_ERR_UNSPEC;
+ }
fprintf(stderr, "csync_enable_statedb: This function must be called before initialization.\n");
return -1;
}
@@ -990,8 +989,6 @@ int csync_is_statedb_disabled(CSYNC *ctx) {
if (ctx == NULL) {
return -1;
}
- ctx->error_code = CSYNC_ERR_NONE;
-
return ctx->statedb.disabled;
}
@@ -999,7 +996,6 @@ int csync_set_auth_callback(CSYNC *ctx, csync_auth_callback cb) {
if (ctx == NULL || cb == NULL) {
return -1;
}
- ctx->error_code = CSYNC_ERR_NONE;
if (ctx->status & CSYNC_STATUS_INIT) {
fprintf(stderr, "csync_set_auth_callback: This function must be called before initialization.\n");
@@ -1052,8 +1048,6 @@ void *csync_get_userdata(CSYNC *ctx) {
if (ctx == NULL) {
return NULL;
}
- ctx->error_code = CSYNC_ERR_NONE;
-
return ctx->callbacks.userdata;
}
@@ -1061,7 +1055,6 @@ int csync_set_userdata(CSYNC *ctx, void *userdata) {
if (ctx == NULL) {
return -1;
}
- ctx->error_code = CSYNC_ERR_NONE;
ctx->callbacks.userdata = userdata;
@@ -1072,7 +1065,6 @@ csync_auth_callback csync_get_auth_callback(CSYNC *ctx) {
if (ctx == NULL) {
return NULL;
}
- ctx->error_code = CSYNC_ERR_NONE;
return ctx->callbacks.auth_function;
}
@@ -1089,7 +1081,6 @@ int csync_set_status(CSYNC *ctx, int status) {
if (ctx == NULL || status < 0) {
return -1;
}
- ctx->error_code = CSYNC_ERR_NONE;
ctx->status = status;
@@ -1100,7 +1091,6 @@ int csync_get_status(CSYNC *ctx) {
if (ctx == NULL) {
return -1;
}
- ctx->error_code = CSYNC_ERR_NONE;
return ctx->status;
}
@@ -1109,7 +1099,6 @@ int csync_enable_conflictcopys(CSYNC* ctx){
if (ctx == NULL) {
return -1;
}
- ctx->error_code = CSYNC_ERR_NONE;
if (ctx->status & CSYNC_STATUS_INIT) {
fprintf(stderr, "csync_enable_conflictcopys: This function must be called before initialization.\n");
diff --git a/src/csync_propagate.c b/src/csync_propagate.c
index 8c09858..4f81c9f 100644
--- a/src/csync_propagate.c
+++ b/src/csync_propagate.c
@@ -1548,13 +1548,15 @@ static int _csync_propagation_file_count_visitor(void *obj, void *data) {
break;
case CSYNC_FTW_TYPE_FILE:
switch (st->instruction) {
- case CSYNC_INSTRUCTION_NEW:
- case CSYNC_INSTRUCTION_SYNC:
- case CSYNC_INSTRUCTION_CONFLICT:
+ case CSYNC_INSTRUCTION_NEW:
+ case CSYNC_INSTRUCTION_SYNC:
+ case CSYNC_INSTRUCTION_CONFLICT:
+ case CSYNC_INSTRUCTION_REMOVE:
+ case CSYNC_INSTRUCTION_RENAME:
ctx->overall_progress.file_count++;
ctx->overall_progress.byte_sum += st->size;
break;
- default:
+ default:
break;
}
break;
diff --git a/src/csync_update.c b/src/csync_update.c
index e667d29..381b370 100644
--- a/src/csync_update.c
+++ b/src/csync_update.c
@@ -206,7 +206,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
}
if((ctx->current == REMOTE_REPLICA && !c_streq(fs->md5, tmp->md5 ))
|| (ctx->current == LOCAL_REPLICA && (fs->mtime != tmp->modtime
-#ifndef _WIN32
+#if 0
|| fs->inode != tmp->inode
#endif
))) {
diff --git a/src/httpbf/src/httpbf.c b/src/httpbf/src/httpbf.c
index 83c9466..6678aaa 100644
--- a/src/httpbf/src/httpbf.c
+++ b/src/httpbf/src/httpbf.c
@@ -36,15 +36,16 @@
#include <neon/ne_request.h>
#include <neon/ne_basic.h>
-#ifdef NDEBUG
-#define DEBUG_HBF(...)
-#else
+// #ifdef NDEBUG
+// #define DEBUG_HBF(...)
+// #else
#define DEBUG_HBF(...) { if(transfer->log_cb) { \
char buf[1024]; \
snprintf(buf, 1024, __VA_ARGS__); \
transfer->log_cb(__FUNCTION__, buf); \
} }
-#endif
+
+// #endif
#define DEFAULT_BLOCK_SIZE (10*1024*1024)
@@ -441,6 +442,7 @@ Hbf_State hbf_transfer( ne_session *session, hbf_transfer_t *transfer, const cha
int do_abort = (transfer->abort_cb)();
if( do_abort ) {
state = HBF_USER_ABORTED;
+ transfer->start_id = block_id % transfer->block_cnt;
}
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/ocsync.git
More information about the Pkg-owncloud-commits
mailing list