aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh_info.erl
diff options
context:
space:
mode:
authorErland Schönbeck <[email protected]>2015-03-23 13:38:24 +0100
committerErland Schönbeck <[email protected]>2015-03-23 13:38:24 +0100
commitd9eb16007cab3238ea2f6667cdc7731b0aa50edc (patch)
tree31faf771fe0b82b707ccc87e56e880adc5594757 /lib/ssh/src/ssh_info.erl
parent84dca51e002b99f0348b715f2f4d484e492bb518 (diff)
parent7a4967882b44e9048949bd8dc6cb6e953ea0c1c9 (diff)
downloadotp-d9eb16007cab3238ea2f6667cdc7731b0aa50edc.tar.gz
otp-d9eb16007cab3238ea2f6667cdc7731b0aa50edc.tar.bz2
otp-d9eb16007cab3238ea2f6667cdc7731b0aa50edc.zip
Merge branch 'maint'
Conflicts: lib/ssh/test/ssh_basic_SUITE.erl
Diffstat (limited to 'lib/ssh/src/ssh_info.erl')
-rw-r--r--lib/ssh/src/ssh_info.erl10
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/ssh/src/ssh_info.erl b/lib/ssh/src/ssh_info.erl
index e23ee836d5..9a91875894 100644
--- a/lib/ssh/src/ssh_info.erl
+++ b/lib/ssh/src/ssh_info.erl
@@ -25,7 +25,6 @@
-module(ssh_info).
-compile(export_all).
--compile([{nowarn_deprecated_function,{erlang,now,0}}]).
print() ->
try supervisor:which_children(ssh_sup)
@@ -180,14 +179,7 @@ line(Len, Char) ->
datetime() ->
- %% Adapt to new OTP 18 erlang time API and be back-compatible
- TimeStamp = try
- erlang:timestamp()
- catch
- error:undef ->
- erlang:now()
- end,
- {{YYYY,MM,DD}, {H,M,S}} = calendar:now_to_universal_time(TimeStamp),
+ {{YYYY,MM,DD}, {H,M,S}} = calendar:now_to_universal_time(now()),
lists:flatten(io_lib:format('~4w-~2..0w-~2..0w ~2..0w:~2..0w:~2..0w UTC',[YYYY,MM,DD, H,M,S])).