fccbe9b Remove flag -m from pkg-fetch (use -o instead). — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Remove flag -m from pkg-fetch (use -o instead).

Vsevolod Stakhov committed 11 years ago

commit fccbe9b68d5425ce0941b483ff92380ed9f925fc
parent b8f1339

2 files changed +6 -12

modified docs/pkg-fetch.8

@@ -31,7 +31,7 @@

 .Nm
 .Op Fl r Ar reponame
 .Op Fl o Ar destdir
 .Op Fl dqUym
 .Op Fl dqUy
 .Fl a
 .Nm
 .Op Fl r Ar reponame

@@ -41,7 +41,7 @@

 .Nm
 .Op Cm --repository Ar reponame
 .Op Cm --output Ar destdir
 .Op Cm --{dependencies,quiet,no-repo-update,yes,mirror}
 .Op Cm --{dependencies,quiet,no-repo-update,yes}
 .Op Cm --{case-sensitive,glob,case-insensitive,regex}
 .Ar pkg-name
 .Op ...

@@ -76,14 +76,12 @@ The following options are supported by

 .Bl -tag -width dependencies
 .It Fl a , Cm --all
 Fetch all packages.
 .It Fl m , Cm --mirror
 Make a mirror of packages from a repository. In this mode, packages are fetched for
 distribution instead of placing them to the internal cache.
 .It Fl o Ar destdir , Cm --output Ar destdir
 Place files to the specified directory instead of the cache directory.
 This option implies
 .Cm mirror
 mode.
 mode. In this mode, packages are fetched for
 distribution instead of placing them to the internal cache.
 .It Fl C , Cm --case-sensitive
 Make the standard or the regular expression
 .Fl ( x )

modified src/fetch.c

@@ -45,7 +45,7 @@

 void
 usage_fetch(void)
 {
 	fprintf(stderr, "Usage: pkg fetch [-r reponame] [-o destdir] [-dqUym] "
 	fprintf(stderr, "Usage: pkg fetch [-r reponame] [-o destdir] [-dqUy] "
 					"[-Cgix] <pkg-name> <...>\n");
 	fprintf(stderr, "       pkg fetch [-r reponame] [-dqUy] -a\n");
 	fprintf(stderr, "       pkg fetch [-r reponame] [-dqUy] -u\n\n");

@@ -78,12 +78,11 @@ exec_fetch(int argc, char **argv)

 		{ "no-repo-update",	no_argument,		NULL,	'U' },
 		{ "regex",		no_argument,		NULL,	'x' },
 		{ "yes",		no_argument,		NULL,	'y' },
 		{ "mirror",		no_argument,		NULL,	'm' },
 		{ "output",		required_argument,	NULL,	'o' },
 		{ NULL,			0,			NULL,	0   },
 	};
 	while ((ch = getopt_long(argc, argv, "+aCdgiqr:Uuxymo:", longopts, NULL)) != -1) {
 	while ((ch = getopt_long(argc, argv, "+aCdgiqr:Uuxyo:", longopts, NULL)) != -1) {
 		switch (ch) {
 		case 'a':
 			match = MATCH_ALL;

@@ -119,9 +118,6 @@ exec_fetch(int argc, char **argv)

 		case 'y':
 			yes = true;
 			break;
 		case 'm':
 			f |= PKG_FLAG_FETCH_MIRROR;
 			break;
 		case 'o':
 			f |= PKG_FLAG_FETCH_MIRROR;
 			destdir = optarg;