# HG changeset patch
# User Tom Gottfried <tom@intevation.de>
# Date 1585590064 -7200
# Node ID c9bca9a9666c33e4eb0bae95586733d76c894445
# Parent  7bbb1e015b4404ae803003764c068a45e82734e1
Do not mask error with subsequent error on commit

If an error occured during the transaction, COMMIT will always return
an error.

diff -r 7bbb1e015b44 -r c9bca9a9666c pkg/imports/wfsjob.go
--- a/pkg/imports/wfsjob.go	Mon Mar 30 11:07:16 2020 +0200
+++ b/pkg/imports/wfsjob.go	Mon Mar 30 19:41:04 2020 +0200
@@ -311,10 +311,14 @@
 		sgc.releaseStmts()
 		sgc.tx = nil
 		sgc.ctx = nil
-		if err2 := tx.Commit(); err2 != nil {
-			// A real error on commit overrules the first.
-			err = err2
+		if err != nil {
+			if err2 := tx.Rollback(); err2 != nil {
+				// A real error on rollback overrules the first.
+				err = err2
+			}
+			return err
 		}
+		err = tx.Commit()
 	}
 	return err
 }