Skip to content
This repository was archived by the owner on Oct 21, 2022. It is now read-only.

Commit 7b769b3

Browse files
committed
Fix compat with net-ssh 4.x.
Ref net-ssh/net-ssh#493
1 parent 74aebc2 commit 7b769b3

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Kitchen-Sync Changelog
22

3+
## v2.1.2
4+
5+
Catch errors from closed sockets during instance shutdown. Fixes compat with
6+
net-ssh 4.x.
7+
38
## v2.1.1
49

510
Allow mixing kitchen-sync transports with other transports.

lib/kitchen-sync/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616

1717

1818
class KitchenSync
19-
VERSION = '2.1.2.pre'
19+
VERSION = '2.1.2'
2020
end

lib/kitchen/transport/sftp.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ def close
5454
sftp_session.close_channel
5555
rescue Net::SSH::Disconnect
5656
# Welp, we tried.
57+
rescue IOError
58+
# Can happen with net-ssh 4.x, no idea why.
59+
# See https://github.com/net-ssh/net-ssh/pull/493
5760
end
5861
end
5962
ensure

0 commit comments

Comments
 (0)