Author: jkupec
Date: Fri Oct 31 11:57:31 2008
New Revision: 11554
URL: http://svn.opensuse.org/viewcvs/zypp?rev=11554&view=rev
Log:
- man + help update
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=11554&r1=11553&r2=11554&view=diff
==============================================================================
--- trunk/zypper/doc/zypper.8 (original)
+++ trunk/zypper/doc/zypper.8 Fri Oct 31 11:57:31 2008
@@ -90,7 +90,7 @@
\- group of packages which are necessary to install a product
.LP
Throughout this manual we will refer to resolvables simply as \fIpackages\fR
-and to resolvable types as \fIpackages types\fR.
+and to resolvable types as \fIpackage types\fR.
.SH "COMMANDS"
@@ -130,8 +130,8 @@
The shell support is not complete
so expect bugs there. However, there's no urgent need to use the shell
-since libzypp became so fast (opensSUSE 11.0), but still, you're welcome
-to experiment with it.
+since libzypp became so fast thanks to the SAT solver and its tools
+(opensSUSE 11.0), but still, you're welcome to experiment with it.
.SS Package Management Commands
@@ -144,7 +144,7 @@
repositories and shows information for this package.
.TP
-.I \-r, \-\-repo
+\fI\-r, \-\-repo\fR
Work only with the repository specified by the alias, number or URI. This
option can be used multiple times.
.TP
@@ -173,8 +173,14 @@
If ARCH is not specified, or the last dot of the capability name string is not
followed by known architecture, the solver will treat the whole string
-as a capability name. If the ARCH is know, the solver will try to choose
-a package with the best compatible architecture to the one specified.
+as a capability name. If the ARCH is known, the solver will select a package
+matching that architecture and complain if such package cannot be found.
+
+Zypper will report packages that it cannot find. Further, in interactive
+mode, zypper proceeds with installation of the rest of requested packages,
+and it will abort immediately in non-interactive mode. In both cases
+zypper returns ZYPPER_EXIT_INF_CAP_NOT_FOUND after finishing
+the operation.
Zypper is also able to install plain RPM files while trying to satisfy their
dependencies using packages from defined repositories. You can install a plain
@@ -203,8 +209,8 @@
.TP
\fI\-r, \-\-repo\fR
-Install packages only from the repository specified by the alias, number or URI.
-This option can be used multiple times.
+Work only with the repository specified by the alias, number or URI. This
+option can be used multiple times.
.TP
\fI\-t, \-\-type\fR <type>
Type of package (default: package). See the beginning of this subsection for the list
@@ -216,6 +222,12 @@
.I \-f, \-\-force
Install even if the item is already installed (reinstall)
.TP
+.I \ \ \ \ \-\-from
+Select packages from specified repository. If strings specified as arguments
+to the install command match packages in repositories specified in this option,
+they will be marked for installation. This option currently implies
+\fI\-\-name\fR, but allows using wildcards for specifying packages.
+.TP
.I \-C, \-\-capability
Select packages by capabilities.
.TP
@@ -243,6 +255,7 @@
Test the installation, do not actually install any package. This option will
add the \-\-test option to the rpm commands run by the install command.
+
.TP
.B source-install (si) <name> ...
Install specified source packages and their build dependencies.
@@ -256,9 +269,9 @@
.I \-D, \-\-no\-build\-deps
Don't install build dependencies.
.TP
-.I \-r, \-\-repo
-Install packages only from specified repositories.
-This option can be used multiple times.
+\fI\-r, \-\-repo\fR
+Work only with the repository specified by the alias, number or URI. This
+option can be used multiple times.
.TP
.B verify (ve) [options]
@@ -271,8 +284,9 @@
.I \-D, \-\-dry-run
Test the repair, do not actually do anything to the system.
.TP
-.I \-r, \-\-repo
-Use only specified repositories to install missing packages.
+\fI\-r, \-\-repo\fR
+Work only with the repository specified by the alias, number or URI. This
+option can be used multiple times.
.TP
.I \ \ \ \ \-\-debug\-solver
Create solver test case for debugging. See the install command for details.
@@ -284,8 +298,9 @@
to repositories or drivers for newly added hardware.
.TP
-.I \-r, \-\-repo
-Use only specified repositories to install packages.
+\fI\-r, \-\-repo\fR
+Work only with the repository specified by the alias, number or URI. This
+option can be used multiple times.
.TP
.I \-D, \-\-dry-run
Test the installation, do not actually install anything.
@@ -311,9 +326,9 @@
Uninstallation of \fBpatterns\fR is currently not implemented.
.TP
-\fI\-r, \-\-repo\fR
-Operate only with packages from repository specified by alias, number or URI.
-This option can be used multiple times.
+\fI\-r, \-\-repo\fR
+Work only with the repository specified by the alias, number or URI. This
+option can be used multiple times.
.TP
\fI\-t, -\-type\fR <type>
Type of package (default: package). See the beginning of this subsection for the list
@@ -362,8 +377,8 @@
for the list of available package types.
.TP
\fI\-r, \-\-repo\fR
-List only updates from the repository specified by the alias, number or URI.
-This option can be used multiple times.
+Work only with the repository specified by the alias, number or URI. This
+option can be used multiple times.
.TP
.I \-a, \-\-all
List all packages for which newer versions are available, regardles whether
@@ -391,8 +406,8 @@
for the list of available package types.
.TP
\fI\-r, \-\-repo\fR
-Limit updates to repository specified by alias, number or URI.
-This option can be used multiple times.
+Work only with the repository specified by the alias, number or URI. This
+option can be used multiple times.
.TP
.I \-\-skip\-interactive
This will skip interactive patches, that is, those that need reboot,
@@ -439,9 +454,9 @@
This command is similar to 'zypper list-updates -t patch'.
.TP
-.I \-r, --repo
-List only patches from the specified repository.
-
+\fI\-r, \-\-repo\fR
+Work only with the repository specified by the alias, number or URI. This
+option can be used multiple times.
.TP
.B patch [options]
@@ -453,8 +468,9 @@
This command is similar to 'zypper update -t patch'.
.TP
-.I \-r, \-\-repo
-Work only with specified repository.
+\fI\-r, \-\-repo\fR
+Work only with the repository specified by the alias, number or URI. This
+option can be used multiple times.
.TP
.I \-\-skip\-interactive
Skip interactive patches.
@@ -477,8 +493,8 @@
.TP
\fI\-r, \-\-repo\fR
-Limit updates to repository specified by alias, number or URI.
-This option can be used multiple times.
+Work only with the repository specified by the alias, number or URI. This
+option can be used multiple times.
.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.
@@ -536,9 +552,9 @@
Search only for packages of specified type. See the beginning of the subsection for the list of available package types.
Multiple \-t option are allowed.
.TP
-.I \-r, \-\-repo
-Search only in the repository specified by the alias, number or URI.
-Multiple \-r options are allowed.
+\fI\-r, \-\-repo\fR
+Work only with the repository specified by the alias, number or URI. This
+option can be used multiple times.
.TP
.I \ \ \ \ \-\-sort\-by\-name
Sort packages by name (default).
@@ -602,9 +618,9 @@
List patches. Lists all patches that are available, including
installed and not applicable ones.
.TP
-.I \-r, \-\-repo
-Check for patches only in the repository specified by the alias, number or URI.
-This option can be used multiple times.
+\fI\-r, \-\-repo\fR
+Work only with the repository specified by the alias, number or URI. This
+option can be used multiple times.
.SS Repository Management
@@ -1290,6 +1306,10 @@
solver mode by default when running in rug-compatible mode. However, it is
possible to turn the forcing of resolution off using this option even in
rug-compatible mode.
+.TP
+.I \-\-entire\-catalog <catalog>
+This option servers for marking all packages from specified catalog for
+installation. This is achieved by simulating 'zypper in --from <repo> '*''.
.RE
.TP
Modified: trunk/zypper/src/Zypper.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=11554&r1=11553&r2=11554&view=diff
==============================================================================
--- trunk/zypper/src/Zypper.cc (original)
+++ trunk/zypper/src/Zypper.cc Fri Oct 31 11:57:31 2008
@@ -901,7 +901,9 @@
"-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n"
" --force-resolution Force the solver to find a solution (even an agressive).\n"
"-D, --dry-run Test the installation, do not actually install.\n"
- ), "package, patch, pattern, product", "package");
+ ), "package, patch, pattern, product", "package") + string(_(
+ // translators: this option belongs to 'install' command
+ " --from Select packages only from specified repository.\n"));
break;
}
@@ -1038,7 +1040,8 @@
};
specific_options = service_add_options;
_command_help = str::form(_(
- // TranslatorExplanation the %s = "yast2, rpm-md, plaindir"
+ // translators: the %s = "ris" (the only service type currently supported)
+ //! \todo s/--name/--name <name> after 11.1 release.
"addservice (as) [options] <URI> <alias>\n"
"\n"
"Add a repository index service to the system.\n"
@@ -1200,7 +1203,8 @@
};
specific_options = service_add_options;
_command_help = str::form(_(
- // TranslatorExplanation the %s = "yast2, rpm-md, plaindir"
+ // translators: the %s = "yast2, rpm-md, plaindir"
+ //! \todo s/--name/--name <name> after 11.1 release.
"addrepo (ar) [options] <URI> <alias>\n"
"addrepo (ar) [options] \n"
"\n"
@@ -1338,6 +1342,7 @@
_command_help = str::form(_(
// translators: %s is "--all|--remote|--local|--medium-type"
// and "--all, --remote, --local, --medium-type"
+ //! \todo s/<1-99>/<#> after 11.1 release.
"modifyrepo (mr) <options> \n"
"modifyrepo (mr) <options> <%s>\n"
"\n"
@@ -2058,6 +2063,7 @@
{0, 0, 0, 0}
};
specific_options = options;
+ //! \todo s/Licenses/licenses, s/EULA/EULAs
_command_help = _(
"licenses\n"
"\n"
@@ -2472,7 +2478,7 @@
if (geteuid() != 0 && !globalOpts().changedRoot)
{
out().error(
- _("Root privileges are required for modifying services."));
+ _("Root privileges are required for modifying system services."));
setExitCode(ZYPPER_EXIT_ERR_PRIVILEGES);
return;
}
@@ -2991,6 +2997,8 @@
if ((optit = _copts.find("entire-catalog")) != _copts.end())
{
if (!_arguments.empty())
+ // translators: rug related message, shown if
+ // 'zypper in --entire-catalog foorepo someargument' is specified
out().warning(_("Ingoring arguments, marking the entire repository."));
_arguments.clear();
_arguments.push_back("*");
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
