Mercurial > gemma

changeset 5140:11c4c5b8041c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset c9bca9a9666c At least the axis import only pretends to import something but actually does not leave anything behind in the database after this commit.
author Tom Gottfried <tom@intevation.de>
date Tue, 31 Mar 2020 10:52:26 +0200
parents 8a7c39804d2f
children 722b7c305319
files pkg/imports/wfsjob.go
diffstat 1 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/imports/wfsjob.go	Tue Mar 31 09:32:23 2020 +0200
+++ b/pkg/imports/wfsjob.go	Tue Mar 31 10:52:26 2020 +0200
@@ -311,14 +311,10 @@
 		sgc.releaseStmts()
 		sgc.tx = nil
 		sgc.ctx = nil
-		if err != nil {
-			if err2 := tx.Rollback(); err2 != nil {
-				// A real error on rollback overrules the first.
-				err = err2
-			}
-			return err
+		if err2 := tx.Commit(); err2 != nil {
+			// A real error on commit overrules the first.
+			err = err2
 		}
-		err = tx.Commit()
 	}
 	return err
 }