1b112c2 Add -l option to register — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Add -l option to register

Baptiste Daroussin committed 14 years ago

commit 1b112c2f300e352ddb405072f6bb4ed557a53e4e
parent 9ae1dc7

2 files changed +9 -4

modified pkg/register.c

@@ -35,7 +35,8 @@ usage_register(void)

 	fprintf(stderr, "usage: pkg register -c comment -d desc -f plist_file -p prefix\n");
 	fprintf(stderr, "                    -m mtree_file -n pkgname -o origin -r maintainer\n");
 	fprintf(stderr, "                    [-P depends] [-C conflicts] [-M message_file] [-s scripts]\n");
 	fprintf(stderr, "                    [-a arch] [-w www] [-O options] [-H] [-i input_dir]\n\n");
 	fprintf(stderr, "                    [-a arch] [-w www] [-O options] [-H] [-i input_dir]\n");
 	fprintf(stderr, "                    [-l]\n\n");
 	fprintf(stderr, "For more information see 'pkg help register'.\n");
 }

@@ -60,6 +61,7 @@ exec_register(int argc, char **argv)

 	size_t size;
 	bool heuristic = false;
 	bool legacy = false;
 	int retcode = 0;
 	int ret = 0;

@@ -70,7 +72,7 @@ exec_register(int argc, char **argv)

 	}
 	pkg_new(&pkg);
 	while ((ch = getopt(argc, argv, "vHc:d:f:p:P:m:o:C:n:M:s:a:r:w:O:i:")) != -1) {
 	while ((ch = getopt(argc, argv, "vHc:d:f:p:P:m:o:C:n:M:s:a:r:w:O:i:l")) != -1) {
 		switch (ch) {
 			case 'v':
 				/* IGNORE */

@@ -139,6 +141,9 @@ exec_register(int argc, char **argv)

 				if ((input_path = strdup(optarg)) == NULL)
 					errx(1, "cannot allocate memory");
 				break;
 			case 'l':
 				legacy = true;
 				break;
 			default:
 				printf("%c\n", ch);
 				usage_register();

@@ -227,7 +232,7 @@ exec_register(int argc, char **argv)

 		retcode = 1;
 	}
 	if (pkg_get(pkg, PKG_MESSAGE) != NULL)
 	if (pkg_get(pkg, PKG_MESSAGE) != NULL && !legacy)
 		printf("%s\n", pkg_get(pkg, PKG_MESSAGE));
 	pkgdb_close(db);

modified ports/pkg2ng

@@ -64,7 +64,7 @@ do

 	MAINTAINER=$( make -C /usr/ports/${ORIGIN} -V MAINTAINER )
 	CMD_ARGS=""
 	CMD_ARGS="-l"
 	test -f ${DB}/+MTREE_DIRS && CMD_ARGS="${CMD_ARGS} -m ${DB}/+MTREE_DIRS"
 	test -f ${DB}/+DISPLAY && CMD_ARGS="${CMD_ARGS} -M ${DB}/+DISPLAY"
 	test -n "${CONFLICTS}" && CMD_ARGS="${CMD_ARGS} -C ${CONFLICTS}"