diff options
author | Hans Nilsson <[email protected]> | 2017-04-07 10:20:29 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2017-04-07 10:20:29 +0200 |
commit | 90aacace4bdb1c883c3829bc66c1c616a81943d9 (patch) | |
tree | 37f2957737075a567d05412e9ff0156a88c6182e /lib/ssh/src/ssh_sftp.erl | |
parent | d88d2cd8e9c50122923adc8b17904664f6360528 (diff) | |
parent | 4d6393bc4df58defbc22c5d97e28bbfdd8794fc6 (diff) | |
download | otp-90aacace4bdb1c883c3829bc66c1c616a81943d9.tar.gz otp-90aacace4bdb1c883c3829bc66c1c616a81943d9.tar.bz2 otp-90aacace4bdb1c883c3829bc66c1c616a81943d9.zip |
Merge branch 'hans/ssh/refactor_ssh/OTP-14264'
Also enables tuple IP-addresses in ssh:connect et al. OTP-14243
Diffstat (limited to 'lib/ssh/src/ssh_sftp.erl')
-rw-r--r-- | lib/ssh/src/ssh_sftp.erl | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/ssh/src/ssh_sftp.erl b/lib/ssh/src/ssh_sftp.erl index 140856c8e3..f1f7b57e8d 100644 --- a/lib/ssh/src/ssh_sftp.erl +++ b/lib/ssh/src/ssh_sftp.erl @@ -1063,15 +1063,6 @@ attr_to_info(A) when is_record(A, ssh_xfer_attr) -> gid = A#ssh_xfer_attr.group}. -%% Added workaround for sftp timestam problem. (Timestamps should be -%% in UTC but they where not) . The workaround uses a deprecated -%% function i calandar. This will work as expected most of the time -%% but has problems for the same reason as -%% calendar:local_time_to_universal_time/1. We consider it better that -%% the timestamps work as expected most of the time instead of none of -%% the time. Hopfully the file-api will be updated so that we can -%% solve this problem in a better way in the future. - unix_to_datetime(undefined) -> undefined; unix_to_datetime(UTCSecs) -> |