Hi All, Please review the patch.
-- Thanks, Abhijeet Kasurde IRC: akasurde http://akasurde.github.io
From cbceb43b39249f4455c232a01aed7aa5c9cc701f Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde <akasu...@redhat.com> Date: Wed, 29 Jun 2016 18:06:12 +0530 Subject: [PATCH] Added fix for checking ldapmodify return code in db-schema-upgrade Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1349769 Signed-off-by: Abhijeet Kasurde <akasu...@redhat.com> --- base/server/python/pki/server/cli/db.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/base/server/python/pki/server/cli/db.py b/base/server/python/pki/server/cli/db.py index c643182b9d1fc93d5452e802c8da37724b341f48..e45aaea795ea2cea21200fd28b2ef1be9e6ce069 100644 --- a/base/server/python/pki/server/cli/db.py +++ b/base/server/python/pki/server/cli/db.py @@ -96,7 +96,15 @@ class DBSchemaUpgrade(pki.cli.CLI): instance = pki.server.PKIInstance(instance_name) instance.load() - self.update_schema(instance, bind_dn, bind_password) + ret = self.update_schema(instance, bind_dn, bind_password) + if ret == 32: + print("ERROR: Unable to find object using Bind DN '%s'" % bind_dn) + print("Upgrade failed") + sys.exit(ret) + elif ret == 49: + print("ERROR: Invalid Credentials") + print("Upgrade failed") + sys.exit(ret) self.print_message('Upgrade complete') @@ -118,11 +126,13 @@ class DBSchemaUpgrade(pki.cli.CLI): if secure.lower() == "true": cmd.append('-Z') + ret = 0 try: - subprocess.check_output(cmd) + subprocess.check_output(cmd, stderr=subprocess.STDOUT) except subprocess.CalledProcessError as e: - print('ldapmodify returns {}: {}'.format(e.returncode, e.output)) + ret = e.returncode + return ret class DBUpgrade(pki.cli.CLI): def __init__(self): -- 2.4.11
_______________________________________________ Pki-devel mailing list Pki-devel@redhat.com https://www.redhat.com/mailman/listinfo/pki-devel
