[zypp-commit] r7198 - in /trunk/zypper: doc/zypper.8 src/zypper.cc

Author: jkupec Date: Wed Sep 12 11:40:30 2007 New Revision: 7198 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7198&view=rev Log: - make package selection by name (--name) the default for install/remove commands - --capability added to install/remove commands to select packages by capability Modified: trunk/zypper/doc/zypper.8 trunk/zypper/src/zypper.cc Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=7198&r1=7197&r2=7198&view=diff ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Wed Sep 12 11:40:30 2007 @@ -47,15 +47,20 @@ Displays full info for the specified packages. .TP -.B install (in) [options] <capability> ... -Install or update resolvables. +.B install (in) [options] <name> ... +.TP +.B install (in) [options] --capability <capability> ... +Install or update packages or other resolvables. + +The resolvables can be selected by their name or by a capability they provide. -Capability is: NAME, or "NAME[OP<EDITION>]", where OP is < <= = >= > and +Capability is: NAME, or "NAME[OP<EDITION>]", where OP is <, <=, =, >=, or > and EDITION is VERSION[-RELEASE], for example: zypper=0.8.8-2. -Names are not only package names but any symbols provided by packages: -/bin/vi, libcurl.so.3, perl(Time::ParseDate). Just remember to quote to protect the -special characters from the shell, for example: zypper\\>0.8.10 or 'zypper>0.8.10' +The NAME component of a capability is not only a package name but any symbol +provided by packages: /bin/vi, libcurl.so.3, perl(Time::ParseDate). +Just remember to quote to protect the special characters from the shell, +for example: zypper\\>0.8.10 or 'zypper>0.8.10' If EDITION is not specified, the newest available version will be installed. This also means that if the package is already installed and newer versions @@ -69,7 +74,10 @@ Type of resolvable (default: package) .TP .I \-n, \-\-name -Select resolvables by older method, considering just names, not capabilities. +Select resolvables by their name (default). +.TP +.I \-n, \-\-capability +Select resolvables by capabilities. .TP .I \-l, \-\-auto\-agree\-with\-licenses Automatically say 'yes' to third party license confirmation prompt. By using this option, you choose to agree with licenses of all third-party software this command will install. This option is particularly useful for administators installing the same set of packages on multiple machines (by an automated process) and have the licenses confirmed before. @@ -100,10 +108,14 @@ .BR update . .TP -.B remove (rm) <capability> ... -Remove resolvables. -.PP -Capability is usually a plain name, for details see the install command. +.B remove (rm) [options] <name> ... +.TP +.B remove (rm) [options] --capability <capability> ... +Remove packages or other resolvables. + +The resolvables can be selected by their name or by a capability they provide. +For details see the install command + .TP \fI\-r, \-\-repo\fR <alias> Operate only with resolvables from repository specified by alias. @@ -112,16 +124,19 @@ Type of resolvable (default: package) .TP .I \-n, \-\-name -Select resolvables by older method, considering just names, not capabilities. +Select resolvables by their name (default). +.TP +.I \-n, \-\-capability +Select resolvables by capabilities. .TP .I \-\-debug\-solver Create solver test case for debugging. See the install command for details. .TP .B update (up) [options] -Update all installed resolvables with newer versions, where applicable. To -update individual packages, use zypper install <name> (see documentation of -the install command for details). +Update all installed packages or other resolvables with patches or their +newer versions, where applicable. To update individual packages, use zypper +install <name> (see documentation of the install command for details). .TP \fI\-t, -\-type\fR Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=7198&r1=7197&r2=7198&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Wed Sep 12 11:40:30 2007 @@ -274,8 +274,10 @@ {"repo", required_argument, 0, 'r'}, // rug compatibility option, we have --repo {"catalog", required_argument, 0, 'c'}, - {"type", required_argument, 0, 't'}, - {"name", no_argument, 0, 'n'}, + {"type", required_argument, 0, 't'}, + // the default (ignored) + {"name", no_argument, 0, 'n'}, + {"capability", no_argument, 0, 'n'}, // rug compatibility, we have global --non-interactive {"no-confirm", no_argument, 0, 'y'}, {"auto-agree-with-licenses", no_argument, 0, 'l'}, @@ -289,6 +291,7 @@ // TranslatorExplanation don't translate the resolvable types // (package, patch, pattern, product) or at least leave also their // originals, since they are expected untranslated on the command line + //! \todo document --capability after 10.3 is out specific_help = _( "install (in) [options] <capability> ...\n" "\n" @@ -310,7 +313,9 @@ // rug compatibility option, we have --repo {"catalog", required_argument, 0, 'c'}, {"type", required_argument, 0, 't'}, - {"name", no_argument, 0, 'n'}, + // the default (ignored) + {"name", no_argument, 0, 'n'}, + {"capability", no_argument, 0, 'n'}, // rug compatibility, we have global --non-interactive {"no-confirm", no_argument, 0, 'y'}, {"debug-solver", no_argument, 0, 0}, @@ -318,6 +323,7 @@ {0, 0, 0, 0} }; specific_options = remove_options; + //! \todo document --capability after 10.3 is out specific_help = _( "remove (rm) [options] <capability> ...\n" "\n" @@ -1115,12 +1121,15 @@ cond_load_resolvables(); bool install_not_remove = command == ZypperCommand::INSTALL; - bool just_name = copts.count("name"); // compatibility method - for ( vector<string>::const_iterator it = arguments.begin(); it != arguments.end(); ++it ) { - if (just_name) - mark_by_name (install_not_remove, kind, *it); + bool by_capability = false; // install by name by default + if (copts.count("capability")) + by_capability = true; + for ( vector<string>::const_iterator it = arguments.begin(); + it != arguments.end(); ++it ) { + if (by_capability) + mark_by_capability (install_not_remove, kind, *it); else - mark_by_capability (install_not_remove, kind, *it); + mark_by_name (install_not_remove, kind, *it); } if (copts.count("debug-solver")) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org