From 68f600f7466abca20ab5b2f81ab3c433a2b87064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erland=20Sch=C3=B6nbeck?= <erland@erlang.org>
Date: Mon, 16 Mar 2015 15:17:26 +0100
Subject: Revert "Use new time API and be back-compatible in ssh"

This reverts commit af972aaf14a5f53510e692f48f672f7e6805ee6d.

Conflicts:
	lib/ssh/test/ssh_basic_SUITE.erl
---
 lib/ssh/src/ssh_info.erl | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'lib/ssh/src/ssh_info.erl')

diff --git a/lib/ssh/src/ssh_info.erl b/lib/ssh/src/ssh_info.erl
index e5a8666af0..9a91875894 100644
--- a/lib/ssh/src/ssh_info.erl
+++ b/lib/ssh/src/ssh_info.erl
@@ -179,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])).
 
 
-- 
cgit v1.2.1