Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 425a292
Release the savepoint on errors.
Julien Laffaye committed 14 years ago
commit 425a2923559ea0c58a1423962e229e018b76f24a
parent 32a1305
1 file changed +7 -3
modified libpkg/pkg_jobs.c
@@ -163,6 +163,7 @@ pkg_jobs_install(struct pkg_jobs *j, bool force)
	char path[MAXPATHLEN + 1];

	const char *cachedir = NULL;

	int flags = 0;
+ 
	int retcode = EPKG_FATAL;



	bool handle_rc = false;
@@ -259,7 +260,7 @@ pkg_jobs_install(struct pkg_jobs *j, bool force)


		if (pkg_add(j->db, path, flags) != EPKG_OK) {

			sql_exec(j->db->sqlite, "ROLLBACK TO upgrade;");
- 
			return (EPKG_FATAL);
+ 
			goto cleanup;

		}



		if (newversion != NULL)
@@ -272,11 +273,14 @@ pkg_jobs_install(struct pkg_jobs *j, bool force)
			sql_exec(j->db->sqlite, "SAVEPOINT upgrade;");

		}

	}
- 
	sql_exec(j->db->sqlite, "RELEASE upgrade;");
+ 
	retcode = EPKG_OK;
+
+ 
	cleanup:
+ 
	sql_exec(j->db->sqlite, "RELEASE upgrade;");

	pkg_free(newpkg);
- 
	return (EPKG_OK);
+ 
	return (retcode);

}



static int