File otp_src_18.3.4.4-compile_info-time.patch of Package erlang
diff -Ndurp otp_src_18.3.4.4/lib/inets/src/inets_app/inets.erl otp_src_18.3.4.4-compile_info-time/lib/inets/src/inets_app/inets.erl
--- otp_src_18.3.4.4/lib/inets/src/inets_app/inets.erl 2016-08-11 17:24:09.000000000 +0300
+++ otp_src_18.3.4.4-compile_info-time/lib/inets/src/inets_app/inets.erl 2016-08-16 16:18:55.665329172 +0300
@@ -260,13 +260,13 @@ mod_version_info(Mod) ->
{value, {attributes, Attr}} = lists:keysearch(attributes, 1, Info),
{value, {vsn, [Vsn]}} = lists:keysearch(vsn, 1, Attr),
{value, {app_vsn, AppVsn}} = lists:keysearch(app_vsn, 1, Attr),
- {value, {compile, Comp}} = lists:keysearch(compile, 1, Info),
- {value, {version, Ver}} = lists:keysearch(version, 1, Comp),
- {value, {time, Time}} = lists:keysearch(time, 1, Comp),
- {Mod, [{vsn, Vsn},
- {app_vsn, AppVsn},
- {compiler_version, Ver},
- {compile_time, Time}]}.
+ CVer = case lists:keysearch(compile, 1, Info) of
+ {value, {compile, [_|_] = Comp}} ->
+ {value, {version, Ver}} = lists:keysearch(version, 1, Comp),
+ [{compiler_version, Ver}];
+ _ -> []
+ end,
+ {Mod, [{vsn, Vsn}, {app_vsn, AppVsn} | CVer]}.
sys_info() ->
SysArch = string:strip(erlang:system_info(system_architecture),right,$\n),
diff -Ndurp otp_src_18.3.4.4/lib/megaco/src/app/megaco.erl otp_src_18.3.4.4-compile_info-time/lib/megaco/src/app/megaco.erl
--- otp_src_18.3.4.4/lib/megaco/src/app/megaco.erl 2016-08-11 17:24:09.000000000 +0300
+++ otp_src_18.3.4.4-compile_info-time/lib/megaco/src/app/megaco.erl 2016-08-16 16:18:55.666329191 +0300
@@ -672,13 +672,13 @@ mod_version_info(Mod) ->
{value, {attributes, Attr}} = lists:keysearch(attributes, 1, Info),
{value, {vsn, [Vsn]}} = lists:keysearch(vsn, 1, Attr),
{value, {app_vsn, AppVsn}} = lists:keysearch(app_vsn, 1, Attr),
- {value, {compile, Comp}} = lists:keysearch(compile, 1, Info),
- {value, {version, Ver}} = lists:keysearch(version, 1, Comp),
- {value, {time, Time}} = lists:keysearch(time, 1, Comp),
- {Mod, [{vsn, Vsn},
- {app_vsn, AppVsn},
- {compiler_version, Ver},
- {compile_time, Time}]}.
+ CVer = case lists:keysearch(compile, 1, Info) of
+ {value, {compile, [_|_] = Comp}} ->
+ {value, {version, Ver}} = lists:keysearch(version, 1, Comp),
+ [{compiler_version, Ver}];
+ _ -> []
+ end,
+ {Mod, [{vsn, Vsn}, {app_vsn, AppVsn} | CVer]}.
sys_info() ->
SysArch = string:strip(erlang:system_info(system_architecture),right,$\n),
diff -Ndurp otp_src_18.3.4.4/lib/snmp/src/app/snmp.erl otp_src_18.3.4.4-compile_info-time/lib/snmp/src/app/snmp.erl
--- otp_src_18.3.4.4/lib/snmp/src/app/snmp.erl 2016-08-11 17:24:09.000000000 +0300
+++ otp_src_18.3.4.4-compile_info-time/lib/snmp/src/app/snmp.erl 2016-08-16 16:18:55.666329191 +0300
@@ -637,13 +637,13 @@ mod_version_info(Mod) ->
{value, {attributes, Attr}} = lists:keysearch(attributes, 1, Info),
{value, {vsn, [Vsn]}} = lists:keysearch(vsn, 1, Attr),
{value, {app_vsn, AppVsn}} = lists:keysearch(app_vsn, 1, Attr),
- {value, {compile, Comp}} = lists:keysearch(compile, 1, Info),
- {value, {version, Ver}} = lists:keysearch(version, 1, Comp),
- {value, {time, Time}} = lists:keysearch(time, 1, Comp),
- {Mod, [{vsn, Vsn},
- {app_vsn, AppVsn},
- {compiler_version, Ver},
- {compile_time, Time}]}.
+ CVer = case lists:keysearch(compile, 1, Info) of
+ {value, {compile, [_|_] = Comp}} ->
+ {value, {version, Ver}} = lists:keysearch(version, 1, Comp),
+ [{compiler_version, Ver}];
+ _ -> []
+ end,
+ {Mod, [{vsn, Vsn}, {app_vsn, AppVsn} | CVer]}.
sys_info() ->
SysArch = string:strip(erlang:system_info(system_architecture),right,$\n),
diff -Ndurp otp_src_18.3.4.4/lib/snmp/src/compile/snmpc.erl otp_src_18.3.4.4-compile_info-time/lib/snmp/src/compile/snmpc.erl
--- otp_src_18.3.4.4/lib/snmp/src/compile/snmpc.erl 2016-08-11 17:24:09.000000000 +0300
+++ otp_src_18.3.4.4-compile_info-time/lib/snmp/src/compile/snmpc.erl 2016-08-16 16:18:55.666329191 +0300
@@ -162,11 +162,7 @@ get_version() ->
MI = ?MODULE:module_info(),
Attr = get_info(attributes, MI),
Vsn = get_info(app_vsn, Attr),
- Comp = get_info(compile, MI),
- Time = get_info(time, Comp),
- {Year, Month, Day, Hour, Min, Sec} = Time,
- io_lib:format("~s [~.4w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w]",
- [Vsn, Year, Month, Day, Hour, Min, Sec]).
+ Vsn.
maybe_display_options(Opts) ->
case lists:member(options, Opts) of