Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › bfc719a
Fix registration of MTREE_DIRS (pointyhat to bapt).
jlaffaye committed 14 years ago
commit bfc719af2b438ba23dfe10459ec9f2cb6fd44d1d
parent 4855851
5 files changed +11 -8
modified libpkg/Makefile
@@ -43,7 +43,7 @@ LDADD+= -L${.CURDIR}/../external/sqlite \
		-lutil \

		-lpthread
- 
DEBUG_FLAGS+=  -g
+ 
DEBUG_FLAGS+=  -g -O0 -DDEBUG

.if defined(PROFILE_BUILD)

DEBUG_FLAGS+=	-pg

.endif
modified libpkg/pkg_util.c
@@ -143,7 +143,7 @@ file_to_buffer(const char *path, char **buffer, off_t *sz)


	if (read(fd, *buffer, st.st_size) == -1) {

		close(fd);
- 
		return (pkg_error_set(EPKG_FATAL, "read(): %s", strerror(errno)));
+ 
		return (pkg_error_set(EPKG_FATAL, "read(%s): %s", path, strerror(errno)));

	}



	close(fd);
modified pkg/Makefile
@@ -12,7 +12,7 @@ SRCS= add.c \
		which.c

BINDIR=		/usr/sbin
- 
DEBUG_FLAGS=	-g
+ 
DEBUG_FLAGS+=	-g -O0

CFLAGS+=	-I${.CURDIR}/../libpkg

LDADD+=		-L../libpkg \

		-lpkgng \
modified pkg/register.c
@@ -109,13 +109,16 @@ exec_register(int argc, char **argv)
	}



	snprintf(fpath, MAXPATHLEN, "%s/+DESC", mdir);
- 
	pkg_set_from_file(pkg, PKG_DESC, fpath);
+ 
	if (pkg_set_from_file(pkg, PKG_DESC, fpath) != EPKG_OK)
+ 
		pkg_error_warn("");



	snprintf(fpath, MAXPATHLEN, "%s/+DISPLAY", mdir);
- 
	pkg_set_from_file(pkg, PKG_MESSAGE, fpath);
+ 
	if (access(fpath, F_OK) == 0 && pkg_set_from_file(pkg, PKG_MESSAGE, fpath) != EPKG_OK)
+ 
		pkg_error_warn("");
- 
	snprintf(fpath, MAXPATHLEN, "%s/+MTREE_DIR", mdir);
- 
	pkg_set_from_file(pkg, PKG_MTREE, mdir);
+ 
	snprintf(fpath, MAXPATHLEN, "%s/+MTREE_DIRS", mdir);
+ 
	if (pkg_set_from_file(pkg, PKG_MTREE, fpath) != EPKG_OK)
+ 
		pkg_error_warn("");



	snprintf(fpath, MAXPATHLEN, "%s/+INSTALL", mdir);

	pkg_addscript(pkg, fpath);
modified ports/pkg2ng
@@ -52,6 +52,6 @@ do
		}

	fi
- 
	rm ${PLIST}
+ 
	rm -rf ${MDIR}

done