From dac54eea244697730fa84f9bef59b4104e76bbf6 Mon Sep 17 00:00:00 2001 From: Jan Kupec Date: Tue, 12 Feb 2008 10:46:23 +0000 Subject: [PATCH] - fix conflicting search -c, --case-sensitive is -C now (bnc #58021) --- doc/zypper.8 | 5 ++++- src/zypper.cc | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/zypper.8 b/doc/zypper.8 index b5fff42..3f31a75 100644 --- a/doc/zypper.8 +++ b/doc/zypper.8 @@ -1,4 +1,4 @@ -.TH "zypper" "8" "0.9.7" "zypper" "System Tools" +.TH "zypper" "8" "0.10.0" "zypper" "System Tools" .SH "SYNTAX" .LP zypper [\fI\-\-global\-options\fR] <\fBcommand\fR> [\fI\-\-command\-options\fR] [\fBcommand-arguments\fR] @@ -266,6 +266,9 @@ Searches for an exact name of the resolvable. .I \-d, \-\-search\-descriptions Search also in summaries and descriptions. .TP +.I \-C, \-\-case\-sensitive +Perform case-sensitive search. +.TP .I \-i, \-\-installed\-only Show only resolvables that are already installed. .TP diff --git a/src/zypper.cc b/src/zypper.cc index ca0ae1f..675df32 100644 --- a/src/zypper.cc +++ b/src/zypper.cc @@ -1027,14 +1027,14 @@ void Zypper::processCommandOptions() {"match-words", no_argument, 0, 0}, {"match-exact", no_argument, 0, 0}, {"search-descriptions", no_argument, 0, 'd'}, - {"case-sensitive", no_argument, 0, 'c'}, + {"case-sensitive", no_argument, 0, 'C'}, {"type", required_argument, 0, 't'}, {"sort-by-name", no_argument, 0, 0}, // rug compatibility option, we have --sort-by-repo {"sort-by-catalog", no_argument, 0, 0}, {"sort-by-repo", no_argument, 0, 0}, // rug compatibility option, we have --repo - {"catalog", required_argument, 0, 'c'}, //! \todo fix conflicting 'c' short option + {"catalog", required_argument, 0, 'c'}, {"repo", required_argument, 0, 'r'}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} @@ -1054,7 +1054,7 @@ void Zypper::processCommandOptions() " --match-words Matches with search strings may only be whole words\n" " --match-exact Searches for an exact package name\n" "-d, --search-descriptions Search also in package summaries and descriptions.\n" - "-c, --case-sensitive Perform case-sensitive search.\n" + "-C, --case-sensitive Perform case-sensitive search.\n" "-i, --installed-only Show only packages that are already installed.\n" "-u, --uninstalled-only Show only packages that are not currently installed.\n" "-t, --type Search only for packages of the specified type.\n" -- 2.7.4