Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Nuke the pkg 'infos' stuff -- it's unused and obsoleted by pkg annotate.
Matthew Seaman committed 12 years ago
commit 15972ee2a09fb79a4db694e2280bcf7b456ae948
parent b678cda
2 files changed +2 -16
modified pkg/pkg-query.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd May 18, 2013
+
.Dd Jun 2, 2013
.Dt PKG-QUERY 8
.Os
.Sh NAME
@@ -86,8 +86,6 @@ Maintainer of the matched package
Comment of the matched package
.It Cm \&%e
Description of the matched package
-
.It Cm \&%i
-
Additional information about the package
.It Cm \&%w
Home page of the matched package
.It Cm \&%l
modified pkg/query.c
@@ -70,8 +70,7 @@ static struct query_flags accepted_query_flags[] = {
	{ 'a', "",		0, PKG_LOAD_BASIC },
	{ 'k', "",		0, PKG_LOAD_BASIC },
	{ 'M', "",		0, PKG_LOAD_BASIC },
-
	{ 'i', "",		0, PKG_LOAD_BASIC },
-
	{ 't', "",		0, PKG_LOAD_BASIC }
+
	{ 't', "",		0, PKG_LOAD_BASIC },
};

static void
@@ -130,11 +129,6 @@ format_str(struct pkg *pkg, struct sbuf *dest, const char *qstr, void *data)
				if (tmp != NULL)
					sbuf_cat(dest, tmp);
				break;
-
			case 'i':
-
				pkg_get(pkg, PKG_INFOS, &tmp);
-
				if (tmp != NULL)
-
					sbuf_cat(dest, tmp);
-
				break;
			case 'a':
				pkg_get(pkg, PKG_AUTOMATIC, &tmp2);
				sbuf_printf(dest, "%d", tmp2);
@@ -526,12 +520,6 @@ format_sql_condition(const char *str, struct sbuf *sqlcond, bool for_remote)
					sbuf_cat(sqlcond, "message");
					state = OPERATOR_STRING;
					break;
-
				case 'i':
-
					if (for_remote)
-
						goto bad_option;
-
					sbuf_cat(sqlcond, "infos");
-
					state = OPERATOR_STRING;
-
					break;
				case 't':
					if (for_remote)
						goto bad_option;