From e4416aba1c71f3d5d02450ebe8d818493b984030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erland=20Sch=C3=B6nbeck?= <erland@erlang.org>
Date: Mon, 2 Mar 2015 09:33:00 +0100
Subject: Use new time API and be back-compatible in ssh

Conflicts:
	lib/ssh/test/ssh_basic_SUITE.erl
---
 lib/ssh/src/ssh_info.erl | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'lib/ssh/src')

diff --git a/lib/ssh/src/ssh_info.erl b/lib/ssh/src/ssh_info.erl
index 9ed598b3ab..e23ee836d5 100644
--- a/lib/ssh/src/ssh_info.erl
+++ b/lib/ssh/src/ssh_info.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2015. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -25,6 +25,7 @@
 -module(ssh_info).
 
 -compile(export_all).
+-compile([{nowarn_deprecated_function,{erlang,now,0}}]).
 
 print() ->
     try supervisor:which_children(ssh_sup)
@@ -179,7 +180,14 @@ line(Len, Char) ->
 	    
 
 datetime() ->
-    {{YYYY,MM,DD}, {H,M,S}} = calendar:now_to_universal_time(now()),
+    %% 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),
     lists:flatten(io_lib:format('~4w-~2..0w-~2..0w ~2..0w:~2..0w:~2..0w UTC',[YYYY,MM,DD, H,M,S])).
 
 
-- 
cgit v1.2.3