X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=lib%2Fzpm.c;h=87ffbbb3ebde53cf464a48fe5a9972883b8a1203;hb=e7ce7c71c84e3e2a394562a6adec73062759f5df;hp=b7d97776659c5c7b22bc6aec59462b2b2e58a138;hpb=042f84f74cd182f06d666781b67b015835bcf407;p=zpackage

diff --git a/lib/zpm.c b/lib/zpm.c
index b7d9777..87ffbbb 100644
--- a/lib/zpm.c
+++ b/lib/zpm.c
@@ -333,6 +333,8 @@ static void zpm_set_db_errmsg(struct zpm *zpm, const char *msg) {
 			if (!zpm->dberrmsg) {
 				zpm->error = 1;
 			}
+		} else {
+			zpm->dberrmsg = 0;
 		}
 	}
 }
@@ -357,7 +359,7 @@ int zpm_init(struct zpm *pkg, char *path) {
 			sqlite3_close(db);
 		}
 		fprintf(stderr, "error (%d): %s: %s\n", rc,
-				pkg->dberrmsg, path);
+				pkg->dberrmsg ? pkg->dberrmsg : "null", path);
 
 		return 0;
 	}
@@ -562,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");