Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various fixes #29

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Various fixes #29

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c80ab77
Fix handling of scp command error.
adiroiban May 19, 2014
3fb733e
Fix receiving small files.
adiroiban May 19, 2014
c8d84cd
Fix receiving empty files.
adiroiban May 19, 2014
a93ac45
Fix transfer on windows.
adiroiban May 19, 2014
ceae3c5
Merge upstream.
adiroiban Mar 4, 2015
6389017
Update merge.
adiroiban Mar 4, 2015
dbdc4b3
Update test runner.
adiroiban Mar 4, 2015
7f6e026
Update readme.
adiroiban Mar 4, 2015
45faccf
Merge master.
adiroiban Mar 29, 2016
3d38684
Update with parsing command in multiple reads.
adiroiban Mar 29, 2016
79272db
Fix bad name.
adiroiban Mar 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix handling of scp command error.
  • Loading branch information
@adiroiban
adiroiban committed May 19, 2014
commit c80ab7799438d783593561a2d2524150d72d1aae
17 changes: 15 additions & 2 deletions scp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,21 @@ def get(self, remote_path, local_path='',
prsv = ('', ' -p')[preserve_times]
self.channel = self.transport.open_session()
self.channel.settimeout(self.socket_timeout)
self.channel.exec_command("scp%s%s -f %s" % (rcsv, prsv,
' '.join(remote_path)))

try:
self.channel.exec_command(
"scp%s%s -f %s" % (rcsv, prsv, ' '.join(remote_path)))
self._recv_all()
except:
# Check to see if we have some data on the channel.
data = self.channel.recv(self.buff_size)
if not data:
raise

code = data[0]
message = data[1:]
raise SCPException('%s %s' % (code, message))

self._recv_all()

if self.channel:
Expand Down