# HG changeset patch
# User Tom Gottfried <tom@intevation.de>
# Date 1585661423 -7200
# Node ID 733f7136a30ed6516f358d6e8b96819609b63378
# Parent  ea22d3efa76c07f9d0959599d13944244bbec30f
Do not mask error with subsequent error on commit

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

diff -r ea22d3efa76c -r 733f7136a30e pkg/imports/wfsjob.go
--- a/pkg/imports/wfsjob.go	Tue Mar 31 14:17:58 2020 +0200
+++ b/pkg/imports/wfsjob.go	Tue Mar 31 15:30:23 2020 +0200
@@ -311,8 +311,10 @@
 		sgc.releaseStmts()
 		sgc.tx = nil
 		sgc.ctx = nil
-		if err2 := tx.Commit(); err2 != nil {
-			// A real error on commit overrules the first.
+		if err2 := tx.Commit(); err2 != nil &&
+			(err == nil || err == ErrFeaturesUnmodified) {
+			// An error on commit that is not induced by the first
+			// overrules the first.
 			err = err2
 		}
 	}