Hello community, here is the log from the commit of package seafile for openSUSE:Factory checked in at 2020-08-10 14:52:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/seafile (Old) and /work/SRC/openSUSE:Factory/.seafile.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "seafile" Mon Aug 10 14:52:01 2020 rev:4 rq:825253 version:7.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/seafile/seafile.changes 2020-06-09 00:06:47.065741980 +0200 +++ /work/SRC/openSUSE:Factory/.seafile.new.3399/seafile.changes 2020-08-10 14:52:05.163813212 +0200 @@ -1,0 +2,12 @@ +Mon Aug 10 06:19:58 UTC 2020 - Paolo Stivanin <[email protected]> + +- For some reasons (very likely a typo), seaf-cli had python33 + instead of python3 set as interpreter. An additional 'sed' was + added to the spec file + +------------------------------------------------------------------- +Fri Jul 31 05:55:43 UTC 2020 - Paolo Stivanin <[email protected]> + +- Update to 7.0.9 (no changelog) + +------------------------------------------------------------------- Old: ---- v7.0.8.tar.gz New: ---- v7.0.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seafile.spec ++++++ --- /var/tmp/diff_new_pack.IkAZvg/_old 2020-08-10 14:52:05.859813579 +0200 +++ /var/tmp/diff_new_pack.IkAZvg/_new 2020-08-10 14:52:05.863813582 +0200 @@ -17,7 +17,7 @@ Name: seafile -Version: 7.0.8 +Version: 7.0.9 Release: 0 Summary: Cloud storage client License: GPL-2.0-only @@ -78,6 +78,7 @@ %setup -q -n seafile-%{version} sed -i -e /\(DESTDIR\)/d lib/libseafile.pc.in sed -i -e 's@#!%{_bindir}/env python@#!%{_bindir}/python3@' app/seaf-cli +sed -i -e 's@#!%{_bindir}/python33@#!%{_bindir}/python3@' app/seaf-cli %build ./autogen.sh ++++++ v7.0.8.tar.gz -> v7.0.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-7.0.8/app/seaf-cli new/seafile-7.0.9/app/seaf-cli --- old/seafile-7.0.8/app/seaf-cli 2020-06-02 10:58:05.000000000 +0200 +++ new/seafile-7.0.9/app/seaf-cli 2020-07-29 04:32:25.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #-*- coding:utf-8 -*- # pylint: disable=E1121 @@ -80,13 +80,6 @@ seaf-cli create -s <seahub-server-url> -n <library-name> -u <username> -p <password> [-a <2fa-code>] -t <description> [-e <library-password>] ''' -from __future__ import print_function -from __future__ import division - -from future import standard_library -standard_library.install_aliases() -from builtins import str -from builtins import input import argparse import os import json @@ -306,14 +299,14 @@ else: headers = None token_json = urlopen("%s/api2/auth-token/" % url, data=data, headers=headers) - tmp = json.loads(token_json) + tmp = json.loads(token_json.decode('utf8')) token = tmp['token'] return token def get_repo_download_info(url, token): headers = { 'Authorization': 'Token %s' % token } repo_info = urlopen(url, headers=headers) - return json.loads(repo_info) + return json.loads(repo_info.decode('utf8')) def seaf_init(args): ''' Initialize config directories''' @@ -391,9 +384,6 @@ repos = seafile_rpc.get_repo_list(-1, -1) print("Name\tID\tPath") for repo in repos: - if sys.version_info[0] == 2: - repo.name = repo.name.encode('utf8') - repo.worktree = repo.worktree.encode('utf8') print(repo.name, repo.id, repo.worktree) @@ -443,10 +433,7 @@ continue printed[repo['id']] = repo['id'] - if sys.version_info[0] == 2: - print(repo['name'].encode('utf8'), repo['id']) - else: - print(repo['name'], repo['id']) + print(repo['name'], repo['id']) def get_base_url(url): @@ -781,8 +768,6 @@ repos = seafile_rpc.get_repo_list(-1, -1) for repo in repos: - if sys.version_info[0] == 2: - repo.name = repo.name.encode('utf8') auto_sync_enabled = seafile_rpc.is_auto_sync_enabled() if not auto_sync_enabled or not repo.auto_sync: print('{:<50s}\t{:<20s}'.format(repo.name, 'auto sync disabled')) @@ -824,7 +809,7 @@ if args.libpasswd: data['passwd'] = args.libpasswd repo_info_json = urlopen(url, data=data, headers=headers) - repo_info = json.loads(repo_info_json) + repo_info = json.loads(repo_info_json.decode('utf8')) return repo_info['repo_id'] def seaf_create(args): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-7.0.8/configure.ac new/seafile-7.0.9/configure.ac --- old/seafile-7.0.8/configure.ac 2020-06-02 10:58:05.000000000 +0200 +++ new/seafile-7.0.9/configure.ac 2020-07-29 04:32:25.000000000 +0200 @@ -2,7 +2,7 @@ AC_PREREQ(2.61) -AC_INIT([seafile], [7.0.8], [[email protected]]) +AC_INIT([seafile], [7.0.9], [[email protected]]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -195,7 +195,14 @@ AC_SUBST(LIBEVENT_PTHREADS_LIBS) fi -AM_PATH_PYTHON([2.6]) +AC_ARG_WITH([python3], [AS_HELP_STRING([--with-python3], [use python3])], + [with_python3="yes"],[]) + +if test "$with_python3" = "yes"; then + AM_PATH_PYTHON([3.5]) +else + AM_PATH_PYTHON([2.7]) +fi if test "$bwin32" = true; then # set pyexecdir to somewhere like /c/Python26/Lib/site-packages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-7.0.8/daemon/http-tx-mgr.c new/seafile-7.0.9/daemon/http-tx-mgr.c --- old/seafile-7.0.8/daemon/http-tx-mgr.c 2020-06-02 10:58:05.000000000 +0200 +++ new/seafile-7.0.9/daemon/http-tx-mgr.c 2020-07-29 04:32:25.000000000 +0200 @@ -1409,8 +1409,10 @@ } if (status == HTTP_OK) { - if (parse_head_commit_info (rsp_content, rsp_size, data) < 0) + if (parse_head_commit_info (rsp_content, rsp_size, data) < 0) { + data->error_code = SYNC_ERROR_ID_NETWORK; goto out; + } data->success = TRUE; } else if (status == HTTP_REPO_DELETED) { data->is_deleted = TRUE; @@ -4418,6 +4420,20 @@ char *block_id; for (i = 0; i < file->n_blocks; ++i) { block_id = file->blk_sha1s[i]; + if (seaf_block_manager_block_exists (seaf->block_mgr, + task->repo_id, task->repo_version, + block_id)) { + BlockMetadata *bmd; + bmd = seaf_block_manager_stat_block (seaf->block_mgr, + task->repo_id, task->repo_version, + block_id); + if (bmd) { + task->done_download += bmd->size; + g_free (bmd); + continue; + } + } + ret = get_block (task, conn, block_id); if (ret < 0 || task->state == HTTP_TASK_STATE_CANCELED) break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-7.0.8/daemon/sync-mgr.c new/seafile-7.0.9/daemon/sync-mgr.c --- old/seafile-7.0.8/daemon/sync-mgr.c 2020-06-02 10:58:05.000000000 +0200 +++ new/seafile-7.0.9/daemon/sync-mgr.c 2020-07-29 04:32:25.000000000 +0200 @@ -395,7 +395,7 @@ if (!info) return; else if (!info->in_sync) { - if (info->current_task->state == SYNC_STATE_ERROR) { + if (info->current_task && info->current_task->state == SYNC_STATE_ERROR) { info->err_cnt = 0; info->in_error = FALSE; info->sync_perm_err_cnt = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-7.0.8/debian/changelog new/seafile-7.0.9/debian/changelog --- old/seafile-7.0.8/debian/changelog 2020-06-02 10:58:05.000000000 +0200 +++ new/seafile-7.0.9/debian/changelog 2020-07-29 04:32:25.000000000 +0200 @@ -1,3 +1,8 @@ +seafile-daemon (7.0.9) unstable; urgency=low + + * new upstream release + + -- Jonathan Xu <[email protected]> Wed, 29 Jul 2020 10:28:58 +0800 seafile-daemon (7.0.8) unstable; urgency=low * new upstream release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-7.0.8/debian/control new/seafile-7.0.9/debian/control --- old/seafile-7.0.8/debian/control 2020-06-02 10:58:05.000000000 +0200 +++ new/seafile-7.0.9/debian/control 2020-07-29 04:32:25.000000000 +0200 @@ -4,6 +4,7 @@ Maintainer: m.eik michalke <[email protected]> Build-Depends: debhelper (>= 7), + dh-python, autotools-dev, libssl-dev, libsqlite3-dev, @@ -15,7 +16,7 @@ libcurl4-openssl-dev, valac, libjansson-dev, - python, + python3 (>= 3.5), libsearpc-dev (>= 3.1.0) Standards-Version: 3.9.5 Homepage: http://seafile.com @@ -26,7 +27,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, - ${python:Depends}, + ${python3:Depends}, Conflicts: seafile Suggests: seafile-gui, seafile-cli Description: Seafile daemon @@ -41,7 +42,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, - ${python:Depends} + ${python3:Depends} Conflicts: seafile Description: Shared libraries for Seafile This package contains the shared libraries for the Seafile daemon. @@ -52,7 +53,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, - ${python:Depends}, + ${python3:Depends}, libseafile0 (>= ${binary:Version}), seafile-daemon (>= ${binary:Version}), python-searpc (>= 3.1.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-7.0.8/debian/libseafile0.install new/seafile-7.0.9/debian/libseafile0.install --- old/seafile-7.0.8/debian/libseafile0.install 2020-06-02 10:58:05.000000000 +0200 +++ new/seafile-7.0.9/debian/libseafile0.install 2020-07-29 04:32:25.000000000 +0200 @@ -1,2 +1,2 @@ usr/lib/*.so.* -usr/lib/python2.7/dist-packages/seafile/*.py +usr/lib/python3*/site-packages/seafile/*.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-7.0.8/debian/rules new/seafile-7.0.9/debian/rules --- old/seafile-7.0.8/debian/rules 2020-06-02 10:58:05.000000000 +0200 +++ new/seafile-7.0.9/debian/rules 2020-07-29 04:32:25.000000000 +0200 @@ -2,11 +2,11 @@ # -*- makefile -*- %: - dh $@ --with python2 --with autotools_dev + dh $@ --with python3 --with autotools_dev override_dh_auto_configure: ./autogen.sh - dh_auto_configure -- --disable-fuse + dh_auto_configure -- --disable-fuse --with-python3 override_dh_auto_test: # make check seems to be broken diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-7.0.8/msi/Includes.wxi new/seafile-7.0.9/msi/Includes.wxi --- old/seafile-7.0.8/msi/Includes.wxi 2020-06-02 10:58:05.000000000 +0200 +++ new/seafile-7.0.9/msi/Includes.wxi 2020-07-29 04:32:25.000000000 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Include Id="SeafileInclude"> - <?define CurrentSeafileVersion="7.0.8" ?> + <?define CurrentSeafileVersion="7.0.9" ?> <!-- Update Guid 不能变 --> <?define CurrentUpdateGuid="65DED1C8-A5F1-4C49-8E7E-B0A8A5A6535C" ?> @@ -140,7 +140,8 @@ <!-- <?define ProductGuid="3A3D3777-A5C1-4089-A2F7-33D55A36E41E" ?> (7.0.5) --> <!-- <?define ProductGuid="9A180890-0EED-4E38-BAB0-A6E148D89F4A" ?> (7.0.6) --> <!-- <?define ProductGuid="1E617234-A273-41F9-8BA7-70C6F1644AC4" ?> (7.0.7) --> - <?define ProductGuid="7944DDB5-1C68-4C9F-9FA5-01224493EFF0" ?> + <!-- <?define ProductGuid="7944DDB5-1C68-4C9F-9FA5-01224493EFF0" ?> (7.0.9) --> + <?define ProductGuid="C54F03E9-9522-4C70-8134-5199BD74AFBA" ?> <?define GuidOfCustomComponent="AD201805-3CBD-4834-9097-5D934F7E0000" ?> <?define GuidOfAutoStartComponent="AD201805-3CBD-4834-9097-5D934F7E0001" ?>
