summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2006-07-15 01:37:13 +0000
committerMarius Mauch <genone@gentoo.org>2006-07-15 01:37:13 +0000
commit11b879722b7a289047c29ef35e897ad38da3852b (patch)
tree5e4d5936c3e7aa9de3dd0215d7fdf2fa178154f9
parentdisable regular expressions for search by default (diff)
downloadportage-idfetch-11b879722b7a289047c29ef35e897ad38da3852b.tar.gz
portage-idfetch-11b879722b7a289047c29ef35e897ad38da3852b.tar.bz2
portage-idfetch-11b879722b7a289047c29ef35e897ad38da3852b.zip
update search docs
svn path=/main/trunk/; revision=3877
-rw-r--r--man/emerge.117
-rw-r--r--pym/emergehelp.py12
2 files changed, 17 insertions, 12 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index 7773fdff..f27e6c0a 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -152,14 +152,15 @@ to do, then portage will exit with a message and a success condition.
.TP
.BR "\-\-search " (\fB\-s\fR)
Searches for matches of the supplied string in the portage tree.
-The \-\-search string is a regular expression. For example, \fBemerge
-\-\-search "^kde"\fR searches for any package whose name starts with "kde";
-\fBemerge \-\-search "gcc$"\fR searches for any package that ends with
-"gcc"; \fBemerge \-\-search "office"\fR searches for any package that
-contains the word "office". If you want to include the category into the
-search string, prepend an @: \fBemerge --search "@^dev-java.*jdk"\fR.
-If you want to search the package descriptions as well, use the
-\fB\-\-searchdesc\fR action.
+By default emerge uses a case-insensitive simple search, but you can
+enable a regular expression search by prefixing the search string with %.
+For example, \fBemerge \-\-search "%^kde"\fR searches for any package whose
+name starts with "kde"; \fBemerge \-\-search "%gcc$"\fR searches for any
+package that ends with "gcc"; \fBemerge \-\-search "office"\fR searches for
+any package that contains the word "office". If you want to include the
+category into the search string, prepend an @: \fBemerge --search
+"%@^dev-java.*jdk"\fR. If you want to search the package descriptions as well,
+use the \fB\-\-searchdesc\fR action.
.TP
.BR "\-\-searchdesc " (\fB\-S\fR)
Matches the search string against the description field as well as
diff --git a/pym/emergehelp.py b/pym/emergehelp.py
index ff6c4e6c..9b1c9032 100644
--- a/pym/emergehelp.py
+++ b/pym/emergehelp.py
@@ -107,15 +107,19 @@ def help(myaction,myopts,havecolor=1):
print
print " "+green("--search")+" ("+green("-s")+" short option)"
print " Searches for matches of the supplied string in the current local"
- print " portage tree. The search string is a regular expression."
+ print " portage tree. By default emerge uses a case-insensitive simple "
+ print " search, but you can enable a regular expression search by "
+ print " prefixing the search string with %%."
print " Prepending the expression with a '@' will cause the category to"
print " be included in the search."
print " A few examples:"
- print " "+bold("emerge search '^kde'")
+ print " "+bold("emerge --search libc")
+ print " list all packages that contain libc in their name"
+ print " "+bold("emerge --search '%^kde'")
print " list all packages starting with kde"
- print " "+bold("emerge search 'gcc$'")
+ print " "+bold("emerge --search '%gcc$'")
print " list all packages ending with gcc"
- print " "+bold("emerge search @^dev-java.*jdk")
+ print " "+bold("emerge --search '%@^dev-java.*jdk'")
print " list all available Java JDKs"
print
print " "+green("--searchdesc")+" ("+green("-S")+" short option)"