Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Fix logic on constraint violation error message.
jlaffaye committed 14 years ago
commit 031f6903c5aa67ed8a3b3a6bbcdfaf0d9ba9aa74
parent b716efc
1 file changed +1 -1
modified libpkg/pkgdb.c
@@ -1006,7 +1006,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg)
		sqlite3_bind_text(stmt_conflict, 1, pkg_conflict_glob(conflicts[i]), -1, SQLITE_STATIC);
		sqlite3_bind_int64(stmt_conflict, 2, package_id);

-
		if (sqlite3_step(stmt_conflict) != SQLITE_DONE) {
+
		if ((ret = sqlite3_step(stmt_conflict)) != SQLITE_DONE) {
			if ( ret == SQLITE_CONSTRAINT)
				retcode = pkg_error_set(EPKG_FATAL, "constraint violation on "
						"conflicts with %s", pkg_conflict_glob(conflicts[i]));