Backport/2.8/56703 (#56829)

* postgresql_db: bugfix 56703 (#56734) (cherry picked from commit f9108e2) * postgresql_db bugfix (backport/2.8/56703)
ansible · May 24, 2019 · 206087e · 206087e
1 parent 6c078e1
commit 206087e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/changelogs/fragments/56734-postgres_bugfix_pg_restore.yml b/changelogs/fragments/56734-postgres_bugfix_pg_restore.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- postgresql_db - fix for postgresql_db fails if stderr contains output (https://github.com/ansible/ansible/issues/56703)
diff --git a/lib/ansible/modules/database/postgresql/postgresql_db.py b/lib/ansible/modules/database/postgresql/postgresql_db.py
@@ -539,16 +539,9 @@ def main():
             try:
                 rc, stdout, stderr, cmd = method(module, target, target_opts, db, **kw)
                 if rc != 0:
-                    module.fail_json(msg='Dump of database %s failed' % db,
-                                     stdout=stdout, stderr=stderr, rc=rc, cmd=cmd)
-
-                elif stderr and 'warning' not in str(stderr):
-                    module.fail_json(msg='Dump of database %s failed' % db,
-                                     stdout=stdout, stderr=stderr, rc=1, cmd=cmd)
-
+                    module.fail_json(msg=stderr, stdout=stdout, rc=rc, cmd=cmd)
                 else:
-                    module.exit_json(changed=True, msg='Dump of database %s has been done' % db,
-                                     stdout=stdout, stderr=stderr, rc=rc, cmd=cmd)
+                    module.exit_json(changed=True, msg=stdout, stderr=stderr, rc=rc, cmd=cmd)
             except SQLParseError as e:
                 module.fail_json(msg=to_native(e), exception=traceback.format_exc())