|
|
a3a2ad |
From f45f7cd9feffcdba68c880b0a28fb7ebde94ad58 Mon Sep 17 00:00:00 2001
|
|
|
a3a2ad |
From: Tomas Jelinek <tojeline@redhat.com>
|
|
|
a3a2ad |
Date: Wed, 3 Jan 2018 17:21:29 +0100
|
|
|
a3a2ad |
Subject: [PATCH] fix exit code when adding a remote or guest node
|
|
|
a3a2ad |
|
|
|
a3a2ad |
---
|
|
|
a3a2ad |
pcs/cli/common/reports.py | 2 +-
|
|
|
a3a2ad |
pcs/cluster.py | 2 +-
|
|
|
a3a2ad |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
a3a2ad |
|
|
|
a3a2ad |
diff --git a/pcs/cli/common/reports.py b/pcs/cli/common/reports.py
|
|
|
a3a2ad |
index 5fd39cb..f96db73 100644
|
|
|
a3a2ad |
--- a/pcs/cli/common/reports.py
|
|
|
a3a2ad |
+++ b/pcs/cli/common/reports.py
|
|
|
a3a2ad |
@@ -130,7 +130,7 @@ def process_library_reports(report_item_list):
|
|
|
a3a2ad |
report_item_list list of ReportItem
|
|
|
a3a2ad |
"""
|
|
|
a3a2ad |
if not report_item_list:
|
|
|
a3a2ad |
- error("Errors have occurred, therefore pcs is unable to continue")
|
|
|
a3a2ad |
+ raise error("Errors have occurred, therefore pcs is unable to continue")
|
|
|
a3a2ad |
|
|
|
a3a2ad |
critical_error = False
|
|
|
a3a2ad |
for report_item in report_item_list:
|
|
|
a3a2ad |
diff --git a/pcs/cluster.py b/pcs/cluster.py
|
|
|
a3a2ad |
index a330164..b66bec7 100644
|
|
|
a3a2ad |
--- a/pcs/cluster.py
|
|
|
a3a2ad |
+++ b/pcs/cluster.py
|
|
|
a3a2ad |
@@ -209,7 +209,7 @@ def cluster_cmd(argv):
|
|
|
a3a2ad |
utils.get_modificators()
|
|
|
a3a2ad |
)
|
|
|
a3a2ad |
except LibraryError as e:
|
|
|
a3a2ad |
- utils.process_library_reports(e.args)
|
|
|
a3a2ad |
+ process_library_reports(e.args)
|
|
|
a3a2ad |
except CmdLineInputError as e:
|
|
|
a3a2ad |
utils.exit_on_cmdline_input_errror(
|
|
|
a3a2ad |
e, "cluster", "node " + argv[0]
|
|
|
a3a2ad |
--
|
|
|
a3a2ad |
1.8.3.1
|
|
|
a3a2ad |
|