Hello community, here is the log from the commit of package python-scp for openSUSE:Factory checked in at 2020-11-26 23:15:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-scp (Old) and /work/SRC/openSUSE:Factory/.python-scp.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-scp" Thu Nov 26 23:15:12 2020 rev:5 rq:850922 version:0.13.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-scp/python-scp.changes 2019-03-26 15:44:59.484109796 +0100 +++ /work/SRC/openSUSE:Factory/.python-scp.new.5913/python-scp.changes 2020-11-26 23:16:09.077072888 +0100 @@ -1,0 +2,6 @@ +Thu Nov 26 08:46:13 UTC 2020 - Dirk Mueller <[email protected]> + +- update to 0.13.3: + - Fix hanging when underlying paramiko channel is closed + +------------------------------------------------------------------- Old: ---- scp-0.13.2.tar.gz New: ---- scp-0.13.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-scp.spec ++++++ --- /var/tmp/diff_new_pack.WKkw2A/_old 2020-11-26 23:16:09.665073344 +0100 +++ /var/tmp/diff_new_pack.WKkw2A/_new 2020-11-26 23:16:09.669073348 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-scp # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2017, Martin Hauke <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-scp -Version: 0.13.2 +Version: 0.13.3 Release: 0 Summary: SSH scp module for paramiko License: LGPL-2.1-or-later ++++++ scp-0.13.2.tar.gz -> scp-0.13.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scp-0.13.2/CHANGELOG.md new/scp-0.13.3/CHANGELOG.md --- old/scp-0.13.2/CHANGELOG.md 2019-03-20 04:28:02.000000000 +0100 +++ new/scp-0.13.3/CHANGELOG.md 2020-10-26 22:25:34.000000000 +0100 @@ -1,5 +1,9 @@ # Changelog +## 0.13.3 (2020-10-26) + +- Fix hanging when underlying paramiko channel is closed + ## 0.13.2 (2019-03-19) - Fix AssertionError in recursive get() when `_rename` is set and server sends a POPD at the end (`_depth > 0`) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scp-0.13.2/PKG-INFO new/scp-0.13.3/PKG-INFO --- old/scp-0.13.2/PKG-INFO 2019-03-20 04:29:26.000000000 +0100 +++ new/scp-0.13.3/PKG-INFO 2020-10-26 22:26:39.943341300 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: scp -Version: 0.13.2 +Version: 0.13.3 Summary: scp module for paramiko Home-page: https://github.com/jbardin/scp.py Author: James Bardin @@ -118,7 +118,7 @@ # Define progress callback that prints the current percentage completed for the file def progress(filename, size, sent): - sys.stdout.write("%s\'s progress: %.2f%% \r" % (filename, float(sent)/float(size)*100) ) + sys.stdout.write("%s's progress: %.2f%% \r" % (filename, float(sent)/float(size)*100) ) # SCPCLient takes a paramiko transport and progress callback as its arguments. scp = SCPClient(ssh.get_transport(), progress=progress) @@ -126,7 +126,7 @@ # you can also use progress4, which adds a 4th parameter to track IP and port # useful with multiple threads to track source def progress4(filename, size, sent, peername): - sys.stdout.write("(%s:%s) %s\'s progress: %.2f%% \r" % (peername[0], peername[1], filename, float(sent)/float(size)*100) ) + sys.stdout.write("(%s:%s) %s's progress: %.2f%% \r" % (peername[0], peername[1], filename, float(sent)/float(size)*100) ) scp = SCPClient(ssh.get_transport(), progress4=progress4) scp.put('test.txt', '~/test.txt') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scp-0.13.2/README.rst new/scp-0.13.3/README.rst --- old/scp-0.13.2/README.rst 2018-11-12 21:51:26.000000000 +0100 +++ new/scp-0.13.3/README.rst 2020-06-15 04:52:26.000000000 +0200 @@ -110,7 +110,7 @@ # Define progress callback that prints the current percentage completed for the file def progress(filename, size, sent): - sys.stdout.write("%s\'s progress: %.2f%% \r" % (filename, float(sent)/float(size)*100) ) + sys.stdout.write("%s's progress: %.2f%% \r" % (filename, float(sent)/float(size)*100) ) # SCPCLient takes a paramiko transport and progress callback as its arguments. scp = SCPClient(ssh.get_transport(), progress=progress) @@ -118,7 +118,7 @@ # you can also use progress4, which adds a 4th parameter to track IP and port # useful with multiple threads to track source def progress4(filename, size, sent, peername): - sys.stdout.write("(%s:%s) %s\'s progress: %.2f%% \r" % (peername[0], peername[1], filename, float(sent)/float(size)*100) ) + sys.stdout.write("(%s:%s) %s's progress: %.2f%% \r" % (peername[0], peername[1], filename, float(sent)/float(size)*100) ) scp = SCPClient(ssh.get_transport(), progress4=progress4) scp.put('test.txt', '~/test.txt') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scp-0.13.2/scp.egg-info/PKG-INFO new/scp-0.13.3/scp.egg-info/PKG-INFO --- old/scp-0.13.2/scp.egg-info/PKG-INFO 2019-03-20 04:29:26.000000000 +0100 +++ new/scp-0.13.3/scp.egg-info/PKG-INFO 2020-10-26 22:26:39.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: scp -Version: 0.13.2 +Version: 0.13.3 Summary: scp module for paramiko Home-page: https://github.com/jbardin/scp.py Author: James Bardin @@ -118,7 +118,7 @@ # Define progress callback that prints the current percentage completed for the file def progress(filename, size, sent): - sys.stdout.write("%s\'s progress: %.2f%% \r" % (filename, float(sent)/float(size)*100) ) + sys.stdout.write("%s's progress: %.2f%% \r" % (filename, float(sent)/float(size)*100) ) # SCPCLient takes a paramiko transport and progress callback as its arguments. scp = SCPClient(ssh.get_transport(), progress=progress) @@ -126,7 +126,7 @@ # you can also use progress4, which adds a 4th parameter to track IP and port # useful with multiple threads to track source def progress4(filename, size, sent, peername): - sys.stdout.write("(%s:%s) %s\'s progress: %.2f%% \r" % (peername[0], peername[1], filename, float(sent)/float(size)*100) ) + sys.stdout.write("(%s:%s) %s's progress: %.2f%% \r" % (peername[0], peername[1], filename, float(sent)/float(size)*100) ) scp = SCPClient(ssh.get_transport(), progress4=progress4) scp.put('test.txt', '~/test.txt') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scp-0.13.2/scp.py new/scp-0.13.3/scp.py --- old/scp-0.13.2/scp.py 2019-03-20 04:28:16.000000000 +0100 +++ new/scp-0.13.3/scp.py 2020-10-26 22:25:40.000000000 +0100 @@ -5,7 +5,7 @@ Utilities for sending files over ssh using the scp1 protocol. """ -__version__ = '0.13.2' +__version__ = '0.13.3' import locale import os @@ -445,7 +445,10 @@ # we have to make sure we don't read the final byte if size - pos <= buff_size: buff_size = size - pos - file_hdl.write(chan.recv(buff_size)) + data = chan.recv(buff_size) + if not data: + raise SCPException("Underlying channel was closed") + file_hdl.write(data) pos = file_hdl.tell() if self._progress: self._progress(path, size, pos, self.peername) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scp-0.13.2/setup.py new/scp-0.13.3/setup.py --- old/scp-0.13.2/setup.py 2019-03-20 04:28:21.000000000 +0100 +++ new/scp-0.13.3/setup.py 2020-10-26 22:25:46.000000000 +0100 @@ -10,7 +10,7 @@ description = fp.read() setup( name = 'scp', - version = '0.13.2', + version = '0.13.3', author = 'James Bardin', author_email = '[email protected]', license = 'LGPL', _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
