Fixed errors merge
This commit is contained in:
parent
9e1b467850
commit
169d388fe4
|
@ -1531,7 +1531,7 @@ function get_snmpwalk($ip_target, $snmp_version, $snmp_community = '',
|
||||||
$snmpwalk_bin = '/usr/pkg/bin/snmpwalk';
|
$snmpwalk_bin = '/usr/pkg/bin/snmpwalk';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$snmpwalk_bin = 'snmpbulkwalk';
|
$snmpwalk_bin = 'snmpwalk';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1742,7 +1742,6 @@ function db_check_minor_relase_available_to_um ($package) {
|
||||||
$exists = false;
|
$exists = false;
|
||||||
foreach ($sqlfiles_num as $num) {
|
foreach ($sqlfiles_num as $num) {
|
||||||
$file_dest = $config["homedir"] . "/extras/mr/updated/$num.sql";
|
$file_dest = $config["homedir"] . "/extras/mr/updated/$num.sql";
|
||||||
|
|
||||||
if (file_exists($file_dest)) {
|
if (file_exists($file_dest)) {
|
||||||
$exists = true;
|
$exists = true;
|
||||||
unlink("$dir/$num.sql");
|
unlink("$dir/$num.sql");
|
||||||
|
|
Loading…
Reference in New Issue