X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=lib%2Fzpm.c;h=87ffbbb3ebde53cf464a48fe5a9972883b8a1203;hb=ada8405d470a7b13eba173bcacfd660e13dfed0d;hp=6827caf629a13693cea6fb3bc73741f5d928b3b3;hpb=8cd48d5a0ad2bcb6e70861a8f94abb987680cc45;p=zpackage

diff --git a/lib/zpm.c b/lib/zpm.c
index 6827caf..87ffbbb 100644
--- a/lib/zpm.c
+++ b/lib/zpm.c
@@ -258,7 +258,6 @@ static
 #include "newdb.c"
 
 int zpm_db_initialize(struct zpm *pkg) {
-	//fprintf(stderr, "initializing zpm database\n");
 	char *error;
 	switch (sqlite3_exec(pkg->db, createdb, (int (*)(void *,int,char **,char **))0, NULL, &error)) {
 		case SQLITE_OK: break;
@@ -266,6 +265,7 @@ int zpm_db_initialize(struct zpm *pkg) {
 			SQLERROR(sqlite3_errmsg(pkg->db));
 			fprintf(stderr, "error: %s\n", error);
 			sqlite3_free(error);
+			zpm_rollback(pkg);
 			return 0;
 			break;
 	}
@@ -323,6 +323,22 @@ struct zpm *zpm_clearmem(struct zpm *zpm) {
 	return zpm;
 }
 
+static void zpm_set_db_errmsg(struct zpm *zpm, const char *msg) {
+	if (zpm) {
+		if (zpm->dberrmsg) {
+			free(zpm->dberrmsg);
+		}
+		if (msg) {
+			zpm->dberrmsg = strdup(msg);
+			if (!zpm->dberrmsg) {
+				zpm->error = 1;
+			}
+		} else {
+			zpm->dberrmsg = 0;
+		}
+	}
+}
+
 int zpm_init(struct zpm *pkg, char *path) {
 	int rc;
 	sqlite3 *db = 0;
@@ -336,8 +352,15 @@ int zpm_init(struct zpm *pkg, char *path) {
 
 	rc = sqlite3_open_v2(path, &db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
 	if (rc) {
-		SQLERROR(sqlite3_errmsg(db));
-		sqlite3_close(db);
+		pkg->error = 1;
+		pkg->dbresult = rc;
+		zpm_set_db_errmsg(pkg, sqlite3_errstr(rc));
+		if (db) {
+			sqlite3_close(db);
+		}
+		fprintf(stderr, "error (%d): %s: %s\n", rc,
+				pkg->dberrmsg ? pkg->dberrmsg : "null", path);
+
 		return 0;
 	}
 	pkg->db   = db;
@@ -541,10 +564,6 @@ static int set_elf_info(sqlite3 *db, char *hash, char *content, size_t length) {
 		int rc;
 
 		/* clear existing for this hash */
-		if (!run_for_hash(db, "delete from elfinfo where file = ?", hash)) {
-			SQLERP(db, "error clearing elf info");
-			return 0;
-		}
 
 		if (!run_for_hash(db, "delete from elflibraries where file = ?", hash)) {
 			SQLERP(db, "error clearing elf library");