diff options
| author | Micael Karlberg <[email protected]> | 2012-03-01 18:12:11 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-03-01 18:12:11 +0100 |
| commit | d5bec369e7afa999d23c271c104101e47a35fb45 (patch) | |
| tree | eb57705d7b756f0ae3d8777de116a89cae3a6f14 /lib/snmp | |
| parent | a05886528ce9a02a79eda82c8868f489dd478aaa (diff) | |
| parent | 5834b490b8f426e2bbdec7d0b41459e09fdfb82a (diff) | |
| download | otp-d5bec369e7afa999d23c271c104101e47a35fb45.tar.gz otp-d5bec369e7afa999d23c271c104101e47a35fb45.tar.bz2 otp-d5bec369e7afa999d23c271c104101e47a35fb45.zip | |
Merge branch 'bmk/snmp/improve_error_handling_reading_config/OTP-9943' into bmk/snmp/snmp422_integration/r15
Diffstat (limited to 'lib/snmp')
| -rw-r--r-- | lib/snmp/src/agent/snmp_standard_mib.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/snmp/src/agent/snmp_standard_mib.erl b/lib/snmp/src/agent/snmp_standard_mib.erl index 7db94e7bd5..7c78e03b3b 100644 --- a/lib/snmp/src/agent/snmp_standard_mib.erl +++ b/lib/snmp/src/agent/snmp_standard_mib.erl @@ -155,7 +155,8 @@ read_standard(Dir) -> FileName = "standard.conf", Gen = fun(D, Reason) -> throw({error, {failed_reading_config_file, - D, FileName, Reason}}) + D, FileName, + file:list_dir(Dir), Reason}}) end, Filter = fun(Standard) -> sort_standard(Standard) end, Check = fun(Entry) -> check_standard(Entry) end, @@ -595,4 +596,4 @@ error(Reason) -> throw({error, Reason}). config_err(F, A) -> - snmpa_error:config_err("[STANDARD-MIB]: " ++ F, A). + snmpa_error:config_err("[STANDARD-MIB] " ++ F, A). |