diff options
| author | Micael Karlberg <[email protected]> | 2011-11-16 17:05:23 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-11-16 17:05:23 +0100 |
| commit | de3506311f61044799eceeda5c378ab7983ecc16 (patch) | |
| tree | c35409242ad5a11ea7a77ab63f62e3cb33129b38 /lib/snmp/src/compile/snmpc.src | |
| parent | 4f872459b0a5b5f15273456ec0266a07f52fc5ac (diff) | |
| parent | ac251265b6c43c5128017ba3b4cad49ad7c432c1 (diff) | |
| download | otp-de3506311f61044799eceeda5c378ab7983ecc16.tar.gz otp-de3506311f61044799eceeda5c378ab7983ecc16.tar.bz2 otp-de3506311f61044799eceeda5c378ab7983ecc16.zip | |
[compiler] Improved version info printout.
OTP-9618
Merge branch 'bmk/snmp/compiler/misc/OTP-9618' into bmk/snmp/r15_integration
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
lib/snmp/vsn.mk
Diffstat (limited to 'lib/snmp/src/compile/snmpc.src')
| -rw-r--r-- | lib/snmp/src/compile/snmpc.src | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/lib/snmp/src/compile/snmpc.src b/lib/snmp/src/compile/snmpc.src index f993335b89..8760ce14b5 100644 --- a/lib/snmp/src/compile/snmpc.src +++ b/lib/snmp/src/compile/snmpc.src @@ -221,7 +221,10 @@ process_args([], #state{verbosity = Verbosity0, file = MIB} = State) -> process_args(["--help"|_Args], _State) -> ok; process_args(["--version"|_Args], #state{version = Version, mfv = MFV} = _State) -> - {ok, lists:flatten(io_lib:format("snmpc ~s (~s)", [Version, MFV]))}; + OtpVersion = otp_release(), + {ok, lists:flatten( + io_lib:format("snmpc ~s [Mib format version ~s] (OTP ~s)", + [Version, MFV, OtpVersion]))}; process_args(["--verbosity", Verbosity0|Args], #state{verbosity = V} = State) when (V =:= undefined) -> Verbosity = list_to_atom(Verbosity0), @@ -398,3 +401,17 @@ usage() -> e(Reason) -> throw({error, Reason}). + +otp_release() -> + system_info(otp_release, string). + +system_info(Tag, Type) -> + case (catch erlang:system_info(Tag)) of + {'EXIT', _} -> + "-"; + Info when is_list(Info) andalso (Type =:= string) -> + Info; + Info -> + lists:flatten(io_lib:format("~w", [Info])) + end. + |