Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 609761f
register: remove -l option
Baptiste Daroussin committed 3 years ago
commit 609761f02095b7b80d2459badff8bf0c3e2669a6
parent bd091f5
2 files changed +6 -19
modified docs/pkg-register.8
@@ -14,7 +14,7 @@
.\"

.\"     @(#)pkg.8

.\"
- 
.Dd August 13, 2021
+ 
.Dd March 22, 2023

.Dt PKG-REGISTER 8

.Os

.Sh NAME
@@ -31,13 +31,13 @@
.Fl M Ar metadatafile

.Pp

.Nm
- 
.Op Cm --{debug,legacy,test,no-registration}
+ 
.Op Cm --{debug,test,no-registration}

.Op Cm --relocate Ar location

.Op Cm --plist Ar plist-file

.Cm --metadata Ar metadatadir

.Cm --root Ar input-path

.Nm
- 
.Op Cm --{debug,legacy,test,no-registration}
+ 
.Op Cm --{debug,test,no-registration}

.Op Cm --relocate Ar location

.Cm --manifest Ar metadatafile

.Sh DESCRIPTION
@@ -123,14 +123,6 @@ Specifies a
style packing list file.

.It Fl i Ar input-path , Cm --root Ar input-path

Specifies the package input path or staging directory.
- 
.It Fl l , Cm --legacy
- 
Tells
- 
.Nm
- 
to generate an old-style package registry entry in a sub-directory of
- 
.Sy $PKG_DBDIR
- 
rather than updating the
- 
.Fa local.sqlite
- 
database.

.It  Fl M Ar manifest , Cm --manifest Ar manifest

Specifies the package manifest file.

Use of this option means that the only file which will be used as a
modified src/register.c
@@ -42,9 +42,9 @@
void

usage_register(void)

{
- 
	fprintf(stderr, "Usage: pkg register [-ldtN] [-i <input-path>]"
+ 
	fprintf(stderr, "Usage: pkg register [-dtN] [-i <input-path>]"

	                " [-f <plist-file>] -m <metadatadir>\n");
- 
	fprintf(stderr, "       pkg register [-ldtN] [-i <input_path>]"
+ 
	fprintf(stderr, "       pkg register [-dtN] [-i <input_path>]"

		        " -M <manifest>\n\n");

	fprintf(stderr, "For more information see 'pkg help register'.\n");

}
@@ -61,7 +61,6 @@ exec_register(int argc, char **argv)
	const char	*input_path = NULL;

	const char	*location   = NULL;
- 
	bool		 legacy        = false;

	bool		 testing_mode  = false;

	bool		 reg_in_db = true;
@@ -73,7 +72,6 @@ exec_register(int argc, char **argv)
	struct option longopts[] = {

		{ "automatic",	no_argument,		NULL,	'A' },

		{ "debug",      no_argument,		NULL,	'd' },
- 
		{ "legacy",	no_argument,		NULL,	'l' },

		{ "manifest",	required_argument,	NULL,	'M' },

		{ "metadata",	required_argument,	NULL,	'm' },

		{ "no-registration", no_argument,	NULL,	'N' },
@@ -99,9 +97,6 @@ exec_register(int argc, char **argv)
		case 'i':

			input_path = optarg;

			break;
- 
		case 'l':
- 
			legacy = true;
- 
			break;

		case 'M':

			mfile = optarg;

			break;
@@ -198,7 +193,7 @@ exec_register(int argc, char **argv)


	retcode = pkg_add_port(db, pkg, input_path, location, testing_mode);
- 
	if (!legacy && retcode == EPKG_OK && messages != NULL) {
+ 
	if (retcode == EPKG_OK && messages != NULL) {

		fflush(messages->fp);

		printf("%s\n", messages->buf);

	}