diff options
| author | Abhijeet Kasurde <akasurde@redhat.com> | 2016-06-29 18:06:12 +0530 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-07-01 01:42:10 +0200 |
| commit | 1913ff38f04dd27641f23cb76b13cb4806720946 (patch) | |
| tree | 7bd3026af67101d788e9044055855d9e15bb1e1e /base/server/python | |
| parent | 097e116c8557e7bee170bc2764c2e000bd49d4c9 (diff) | |
| download | pki-1913ff38f04dd27641f23cb76b13cb4806720946.tar.gz pki-1913ff38f04dd27641f23cb76b13cb4806720946.tar.xz pki-1913ff38f04dd27641f23cb76b13cb4806720946.zip | |
Added fix for checking ldapmodify return code in db-schema-upgrade
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1349769
Diffstat (limited to 'base/server/python')
| -rw-r--r-- | base/server/python/pki/server/cli/db.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/base/server/python/pki/server/cli/db.py b/base/server/python/pki/server/cli/db.py index 5915417c2..6555e4078 100644 --- a/base/server/python/pki/server/cli/db.py +++ b/base/server/python/pki/server/cli/db.py @@ -100,7 +100,12 @@ class DBSchemaUpgrade(pki.cli.CLI): sys.exit(1) instance.load() - self.update_schema(instance, bind_dn, bind_password) + try: + self.update_schema(instance, bind_dn, bind_password) + + except subprocess.CalledProcessError as e: + print("ERROR: " + e.output) + sys.exit(e.returncode) self.print_message('Upgrade complete') @@ -122,10 +127,7 @@ class DBSchemaUpgrade(pki.cli.CLI): if secure.lower() == "true": cmd.append('-Z') - try: - subprocess.check_output(cmd) - except subprocess.CalledProcessError as e: - print('ldapmodify returns {}: {}'.format(e.returncode, e.output)) + subprocess.check_output(cmd, stderr=subprocess.STDOUT) class DBUpgrade(pki.cli.CLI): |