Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage-utils:master commit in: man/include/, man/, /
Date: Tue, 03 Apr 2018 13:39:42
Message-Id: 1522761201.81df4a8cfbd2998e43842440bb2d57d620b6ff7d.grobian@gentoo
1 commit: 81df4a8cfbd2998e43842440bb2d57d620b6ff7d
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 3 13:13:21 2018 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 3 13:13:21 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=81df4a8c
7
8 qsearch: improve documentation
9
10 Bug: https://bugs.gentoo.org/645554
11
12 man/include/qsearch.desc | 3 +++
13 man/include/qsearch.optdesc.yaml | 2 ++
14 man/qsearch.1 | 36 ++++++++++++++++++++----------------
15 qsearch.c | 6 +++---
16 4 files changed, 28 insertions(+), 19 deletions(-)
17
18 diff --git a/man/include/qsearch.desc b/man/include/qsearch.desc
19 new file mode 100644
20 index 0000000..281c5a3
21 --- /dev/null
22 +++ b/man/include/qsearch.desc
23 @@ -0,0 +1,3 @@
24 +\fIqsearch\fR performs a search over the name and/or description of
25 +packages. By default, a search over all package names is performed over
26 +all ebuilds in the tree.
27
28 diff --git a/man/include/qsearch.optdesc.yaml b/man/include/qsearch.optdesc.yaml
29 new file mode 100644
30 index 0000000..9bbaeaa
31 --- /dev/null
32 +++ b/man/include/qsearch.optdesc.yaml
33 @@ -0,0 +1,2 @@
34 +verbose: Ignored for compatibility with other qapplets.
35 +quiet: Ignored for compatibility with other qapplets.
36
37 diff --git a/man/qsearch.1 b/man/qsearch.1
38 index 5f888ba..3c6032d 100644
39 --- a/man/qsearch.1
40 +++ b/man/qsearch.1
41 @@ -1,56 +1,60 @@
42 -.TH qsearch "1" "Mar 2016" "Gentoo Foundation" "qsearch"
43 +.\" generated by mkman.py, please do NOT edit!
44 +.TH qsearch "1" "Apr 2018" "Gentoo Foundation" "qsearch"
45 .SH NAME
46 qsearch \- search pkgname/desc
47 .SH SYNOPSIS
48 .B qsearch
49 \fI[opts] <regex>\fR
50 .SH DESCRIPTION
51 -
52 +\fIqsearch\fR performs a search over the name and/or description of
53 +packages. By default, a search over all package names is performed over
54 +all ebuilds in the tree.
55 .SH OPTIONS
56 .TP
57 \fB\-a\fR, \fB\-\-all\fR
58 -List the descriptions of every package in the cache
59 +List the descriptions of every package in the cache.
60 .TP
61 \fB\-c\fR, \fB\-\-cache\fR
62 -Use the portage cache (default)
63 +Use the portage cache.
64 .TP
65 \fB\-e\fR, \fB\-\-ebuilds\fR
66 -Use the portage ebuild tree
67 +Use the portage ebuild tree (default).
68 .TP
69 \fB\-s\fR, \fB\-\-search\fR
70 -Regex search package basenames
71 +Regex search package basenames.
72 .TP
73 \fB\-S\fR \fI<arg>\fR, \fB\-\-desc\fR \fI<arg>\fR
74 -Regex search package descriptions
75 +Regex search package descriptions.
76 .TP
77 \fB\-N\fR, \fB\-\-name\-only\fR
78 -Only show package name
79 +Only show package name.
80 .TP
81 \fB\-H\fR, \fB\-\-homepage\fR
82 -Show homepage info
83 +Show homepage info.
84 .TP
85 \fB\-\-root\fR \fI<arg>\fR
86 -Set the ROOT env var
87 +Set the ROOT env var.
88 .TP
89 \fB\-v\fR, \fB\-\-verbose\fR
90 -Make a lot of noise
91 +Ignored for compatibility with other qapplets.
92 .TP
93 \fB\-q\fR, \fB\-\-quiet\fR
94 -Tighter output; suppress warnings
95 +Ignored for compatibility with other qapplets.
96 .TP
97 \fB\-C\fR, \fB\-\-nocolor\fR
98 -Don't output color
99 +Don't output color.
100 .TP
101 \fB\-h\fR, \fB\-\-help\fR
102 -Print this help and exit
103 +Print this help and exit.
104 .TP
105 \fB\-V\fR, \fB\-\-version\fR
106 -Print version and exit
107 +Print version and exit.
108
109 .SH "REPORTING BUGS"
110 Please report bugs via http://bugs.gentoo.org/
111 .br
112 -Product: Portage Development; Component: Tools
113 +Product: Portage Development; Component: Tools, Assignee:
114 +portage-utils@g.o
115 .SH AUTHORS
116 .nf
117 Ned Ludd <solar@g.o>
118
119 diff --git a/qsearch.c b/qsearch.c
120 index a620f95..4fce4de 100644
121 --- a/qsearch.c
122 +++ b/qsearch.c
123 @@ -1,5 +1,5 @@
124 /*
125 - * Copyright 2005-2014 Gentoo Foundation
126 + * Copyright 2005-2018 Gentoo Foundation
127 * Distributed under the terms of the GNU General Public License v2
128 *
129 * Copyright 2005-2010 Ned Ludd - <solar@g.o>
130 @@ -21,8 +21,8 @@ static struct option const qsearch_long_opts[] = {
131 };
132 static const char * const qsearch_opts_help[] = {
133 "List the descriptions of every package in the cache",
134 - "Use the portage cache (default)",
135 - "Use the portage ebuild tree",
136 + "Use the portage cache",
137 + "Use the portage ebuild tree (default)",
138 "Regex search package basenames",
139 "Regex search package descriptions",
140 "Only show package name",