Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE
pacemaker.8750
pacemaker-tools-suppress-invalid-error-message-...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File pacemaker-tools-suppress-invalid-error-message-crm_resource-force.patch of Package pacemaker.8750
commit 8ebea35cbd5022396e6578eafd546201e8c359ef Author: Keisuke MORI <kskmori@intellilink.co.jp> Date: Fri Oct 13 09:37:09 2017 +0900 Low: tools: suppress an invalid error message for crm_resource --force-* options diff --git a/tools/crm_resource.c b/tools/crm_resource.c index d3ace7439..385f132c9 100644 --- a/tools/crm_resource.c +++ b/tools/crm_resource.c @@ -431,6 +431,7 @@ main(int argc, char **argv) bool require_crmd = FALSE; /* whether command requires connection to CRMd */ int rc = pcmk_ok; + int is_ocf_rc = 0; int option_index = 0; int timeout_ms = 0; int argerr = 0; @@ -871,6 +872,9 @@ main(int argc, char **argv) } else if (rsc_cmd == 0 && rsc_long_cmd) { /* validate or force-(stop|start|check) */ rc = cli_resource_execute(rsc_id, rsc_long_cmd, override_params, cib_conn, &data_set); + if (rc >= 0) { + is_ocf_rc = 1; + } } else if (rsc_cmd == 'A' || rsc_cmd == 'a') { GListPtr lpc = NULL; @@ -1188,7 +1192,7 @@ main(int argc, char **argv) CMD_ERR("Error performing operation: %s", pcmk_strerror(rc)); CMD_ERR("Try using -f"); - } else if (rc != pcmk_ok) { + } else if (rc != pcmk_ok && !is_ocf_rc) { CMD_ERR("Error performing operation: %s", pcmk_strerror(rc)); }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor