Hello community, here is the log from the commit of package duplicity for openSUSE:Factory checked in at 2019-07-21 11:35:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/duplicity (Old) and /work/SRC/openSUSE:Factory/.duplicity.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "duplicity" Sun Jul 21 11:35:13 2019 rev:47 rq:717188 version:0.8.01 Changes: -------- --- /work/SRC/openSUSE:Factory/duplicity/duplicity.changes 2019-07-17 13:21:03.915613744 +0200 +++ /work/SRC/openSUSE:Factory/.duplicity.new.4126/duplicity.changes 2019-07-21 11:35:14.460767274 +0200 @@ -1,0 +2,13 @@ +Sat Jul 20 08:04:02 UTC 2019 - Andrei Dziahel <[email protected]> + +- require python3-future: fixes runtime error starting duplicity + +------------------------------------------------------------------- +Fri Jul 19 15:10:05 UTC 2019 - Michael Gorse <[email protected]> + +- Add duplicity-old-div.patch: fix "old_div not defined" errors + (lp#1836829). +- Add duplicity-dropbox-strings.patch: fix dropbox backend mixing + bytes and strings (lp#1836611). + +------------------------------------------------------------------- New: ---- duplicity-dropbox-strings.patch duplicity-old-div.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ duplicity.spec ++++++ --- /var/tmp/diff_new_pack.2rnNxc/_old 2019-07-21 11:35:14.856767193 +0200 +++ /var/tmp/diff_new_pack.2rnNxc/_new 2019-07-21 11:35:14.860767191 +0200 @@ -25,6 +25,8 @@ URL: http://duplicity.nongnu.org/ Source: https://code.launchpad.net/%{name}/0.8-series/%{version}/+download/%{name}-%{version}.tar.gz Patch1: duplicity-remove_shebang.patch +Patch2: duplicity-old-div.patch +Patch3: duplicity-dropbox-strings.patch BuildRequires: fdupes BuildRequires: librsync-devel >= 0.9.6 BuildRequires: python-rpm-macros @@ -33,6 +35,7 @@ BuildRequires: python3-setuptools Requires: gpg Requires: python3-fasteners +Requires: python3-future Requires: python3-lockfile Recommends: %{name}-lang Recommends: lftp @@ -56,6 +59,8 @@ %prep %setup -q %patch1 -p1 +%patch2 -p0 +%patch3 -p0 %build %python3_build ++++++ duplicity-dropbox-strings.patch ++++++ === modified file 'duplicity/backends/dpbxbackend.py' --- duplicity/backends/dpbxbackend.py 2019-06-17 15:10:58 +0000 +++ duplicity/backends/dpbxbackend.py 2019-07-19 14:51:53 +0000 @@ -209,7 +209,7 @@ @command() def _put(self, source_path, remote_filename): remote_dir = urllib.parse.unquote(self.parsed_url.path.lstrip(u'/')) - remote_path = u'/' + os.path.join(remote_dir, remote_filename).rstrip() + remote_path = u'/' + os.path.join(remote_dir, remote_filename.decode()).rstrip() file_size = os.path.getsize(source_path.name) progress.report_transfer(0, file_size) @@ -368,7 +368,7 @@ self.login() remote_dir = urllib.parse.unquote(self.parsed_url.path.lstrip(u'/')) - remote_path = u'/' + os.path.join(remote_dir, remote_filename).rstrip() + remote_path = u'/' + os.path.join(remote_dir, remote_filename.decode()).rstrip() log.Debug(u'dpbx,files_download(%s)' % remote_path) res_metadata, http_fd = self.api_client.files_download(remote_path) @@ -433,7 +433,7 @@ self.login() remote_dir = urllib.parse.unquote(self.parsed_url.path.lstrip(u'/')) - remote_path = u'/' + os.path.join(remote_dir, filename).rstrip() + remote_path = u'/' + os.path.join(remote_dir, filename.decode()).rstrip() log.Debug(u'dpbx.files_delete(%s)' % remote_path) self.api_client.files_delete(remote_path) @@ -452,7 +452,7 @@ if not self.user_authenticated(): self.login() remote_dir = urllib.parse.unquote(self.parsed_url.path.lstrip(u'/')) - remote_path = u'/' + os.path.join(remote_dir, filename).rstrip() + remote_path = u'/' + os.path.join(remote_dir, filename.decode()).rstrip() log.Debug(u'dpbx.files_get_metadata(%s)' % remote_path) info = self.api_client.files_get_metadata(remote_path) ++++++ duplicity-old-div.patch ++++++ === modified file 'duplicity/progress.py' --- duplicity/progress.py 2019-06-17 15:10:58 +0000 +++ duplicity/progress.py 2019-07-19 14:51:53 +0000 @@ -262,8 +262,8 @@ Compute Exponential Moving Average of speed as bytes/sec of the last 30 probes """ if elapsed.total_seconds() > 0: - self.transfers.append(old_div(float(self.total_bytecount - self.last_total_bytecount), - float(elapsed.total_seconds()))) + self.transfers.append(float(self.total_bytecount - self.last_total_bytecount) // + float(elapsed.total_seconds())) self.last_total_bytecount = self.total_bytecount if len(self.transfers) > 30: self.transfers.popleft() === modified file 'duplicity/backends/_boto_multi.py' --- duplicity/backends/_boto_multi.py 2019-07-04 19:04:18 +0000 +++ duplicity/backends/_boto_multi.py 2019-07-19 14:51:53 +0000 @@ -217,8 +217,8 @@ log.Debug((u"{name}: Uploaded chunk {chunk}" u"at roughly {speed} bytes/second").format(name=worker_name, chunk=offset + 1, - speed=(old_div(bytes, max(1, - abs(end - start)))))) + speed=(bytes // + max(1, abs(end - start))))) break conn.close() conn = None
