From 45af7348fe1a3e351660d7601210f6f1db8e4d5b Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 6 Aug 2019 11:32:55 +0200
Subject: [PATCH] utils/ansible-ipa-[server,replica,client]-install: Add
p.wait() for returncode
The p.wait() call has been missing in the normal case, therefore no proper
returncode has been returned.
---
utils/ansible-ipa-client-install | 5 +++--
utils/ansible-ipa-replica-install | 5 +++--
utils/ansible-ipa-server-install | 5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/utils/ansible-ipa-client-install b/utils/ansible-ipa-client-install
index 273f997f..66c32c4e 100755
--- a/utils/ansible-ipa-client-install
+++ b/utils/ansible-ipa-client-install
@@ -245,8 +245,9 @@ def run_cmd(args):
except KeyboardInterrupt:
p.wait()
raise
-
- return p.returncode
+ else:
+ p.wait()
+ return p.returncode
def main(options, args):
diff --git a/utils/ansible-ipa-replica-install b/utils/ansible-ipa-replica-install
index 16e700f2..f894bd84 100755
--- a/utils/ansible-ipa-replica-install
+++ b/utils/ansible-ipa-replica-install
@@ -313,8 +313,9 @@ def run_cmd(args):
except KeyboardInterrupt:
p.wait()
raise
-
- return p.returncode
+ else:
+ p.wait()
+ return p.returncode
def main(options, args):
diff --git a/utils/ansible-ipa-server-install b/utils/ansible-ipa-server-install
index 906bca3c..82be5fe5 100755
--- a/utils/ansible-ipa-server-install
+++ b/utils/ansible-ipa-server-install
@@ -349,8 +349,9 @@ def run_cmd(args):
except KeyboardInterrupt:
p.wait()
raise
-
- return p.returncode
+ else:
+ p.wait()
+ return p.returncode
def main(options, args):
--
GitLab