Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 9e3c146
nuke dirrmtry expansion + uniq some lists + fix stupid bug
Baptiste Daroussin committed 14 years ago
commit 9e3c14643c10deea32e76802c1675d6b8d772d32
parent efacaf5
2 files changed +8 -7
modified libpkg/pkgdb.c
@@ -1341,7 +1341,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg)
		sqlite3_bind_text(stmt_dirs, 1, pkg_dir_path(dir), -1, SQLITE_STATIC);

		sqlite3_bind_int64(stmt_dir, 1, package_id);

		sqlite3_bind_text(stmt_dir, 2, pkg_dir_path(dir), -1, SQLITE_STATIC);
- 
		sqlite3_bind_int64(stmt_dir, 1, pkg_dir_try(dir));
+ 
		sqlite3_bind_int64(stmt_dir, 3, pkg_dir_try(dir));

			

		if ((ret = sqlite3_step(stmt_dirs)) != SQLITE_DONE) {

			ERROR_SQLITE(s);
modified ports/bsd.pkgng.mk
@@ -18,6 +18,7 @@ PKGPOSTDEINSTALL?= ${PKGDIR}/pkg-post-deinstall
PKGPREUPGRADE?=		${PKGDIR}/pkg-pre-upgrade

PKGPOSTUPGRADE?=	${PKGDIR}/pkg-post-upgrade

PKGUPGRADE?=		${PKGDIR}/pkg-upgrade
+ 
PLIST_REINPLACE:=	${PLIST_REINPLACE:Ndirrmtry}



ACTUAL-PACKAGE-DEPENDS?= \

	if [ "${_LIB_RUN_DEPENDS}" != "  " ]; then \
@@ -45,7 +46,7 @@ fake-pkg:


	@${MAKE} -C ${.CURDIR} actual-package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | sort -u >> ${MANIFESTF}

	@${ECHO_CMD} -n "categories: [" >> ${MANIFESTF}
- 
.for cat in ${CATEGORIES}
+ 
.for cat in ${CATEGORIES:u}

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

.endfor

	@${ECHO_CMD} "]" >> ${MANIFESTF}
@@ -55,27 +56,27 @@ fake-pkg:
	@${ECHO_CMD} "licenselogic: single" >> ${MANIFESTF}

.endif

	@${ECHO_CMD} -n "licenses: [" >> ${MANIFESTF}
- 
.for lic in ${LICENSE}
+ 
.for lic in ${LICENSE:u}

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

.endfor

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

.if !defined(DISABLE_CONFLICTS)

	@${ECHO_CMD} -n "conflicts: [" >> ${MANIFESTF}
- 
.for conflicts in ${CONFLICTS}
+ 
.for conflicts in ${CONFLICTS:u}

	@${ECHO_CMD} -n "\"${conflicts}\"," >> ${MANIFESTF}

.endfor
- 
.for conflicts in ${CONFLICTS_INSTALL}
+ 
.for conflicts in ${CONFLICTS_INSTALL:u}

	@${ECHO_CMD} -n "\"${conflicts}\"," >> ${MANIFESTF}

.endfor

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

.endif

	@${ECHO_CMD} -n "users: [" >> ${MANIFESTF}
- 
.for user in ${USERS}
+ 
.for user in ${USERS:u}

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

.endfor

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

	@${ECHO_CMD} -n "groups: [" >> ${MANIFESTF}
- 
.for group in ${GROUPS}
+ 
.for group in ${GROUPS:u}

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

.endfor

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