Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 3ef1e57
Fix deletion and bsd.pkgng.mk
Baptiste Daroussin committed 14 years ago
commit 3ef1e57760cfb8ecd7081e9e4517c0d501f68fcc
parent 0e452c4
2 files changed +7 -7
modified libpkg/pkgdb.c
@@ -1500,13 +1500,13 @@ pkgdb_unregister_pkg(struct pkgdb *db, const char *origin)
	}



	/* cleanup directories */
- 
	if (sql_exec(db->sqlite, "DELETE from directories WHERE id NOT IN (SELECT DISTINCT directory_id FROM pkg_dirs_assoc);") != EPKG_OK)
+ 
	if (sql_exec(db->sqlite, "DELETE from directories WHERE id NOT IN (SELECT DISTINCT directory_id FROM pkg_directories);") != EPKG_OK)

		return (EPKG_FATAL);
- 
	if (sql_exec(db->sqlite, "DELETE from categories WHERE id NOT IN (SELECT DISTINCT category_id FROM pkg_categories_assoc);") != EPKG_OK)
+ 
	if (sql_exec(db->sqlite, "DELETE from categories WHERE id NOT IN (SELECT DISTINCT category_id FROM pkg_categories);") != EPKG_OK)

		return (EPKG_FATAL);
- 
	if (sql_exec(db->sqlite, "DELETE from licenses WHERE id NOT IN (SELECT DISTINCT license_id FROM pkg_licenses_assoc);") != EPKG_OK)
+ 
	if (sql_exec(db->sqlite, "DELETE from licenses WHERE id NOT IN (SELECT DISTINCT license_id FROM pkg_licenses);") != EPKG_OK)

		return (EPKG_FATAL);



	if (sql_exec(db->sqlite, "DELETE FROM mtree WHERE id NOT IN (SELECT DISTINCT mtree_id FROM packages);") != EPKG_OK)
modified ports/bsd.pkgng.mk
@@ -50,19 +50,19 @@ fake-pkg:
	@${MAKE} -C ${.CURDIR} actual-package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u | ${AWK} '{ print "  "$$1": { origin: "$$2", version: "$$3"}" }' >> ${MANIFESTF}

	@${ECHO_CMD} -n "categories: [" >> ${MANIFESTF}

.for cat in ${CATEGORIES}
- 
	@${ECHO_CMD} -n "${cat}" >> ${MANIFESTF}
+ 
	@${ECHO_CMD} -n "${cat}," >> ${MANIFESTF}

.endfor

	@${ECHO_CMD} "]" >> ${MANIFESTF}

.if defined(LICENSE_COMB)
- 
	@${ECHO_CMD} "licenselogic: single" >> ${MANIFESTF}
- 
.else

	@${ECHO_CMD} "licenselogic: ${LICENSE_COMB}" >> ${MANIFESTF}
+ 
.else
+ 
	@${ECHO_CMD} "licenselogic: single" >> ${MANIFESTF}

.endif

	@${ECHO_CMD} -n "licenses: [" >> ${MANIFESTF}

.for lic in ${LICENSE}

	@${ECHO_CMD} -n "${lic}," >> ${MANIFESTF}

.endfor
- 
	@${ECHO_CMD} "]"
+ 
	@${ECHO_CMD} "]" >> ${MANIFESTF}

.if !defined(DISABLE_CONFLICTS)

	@${ECHO_CMD} -n "conflicts: [" >> ${MANIFESTF}

.for conflicts in ${CONFLICTS}