Author: jkupec
Date: Mon Oct 27 15:16:04 2008
New Revision: 11506
URL: http://svn.opensuse.org/viewcvs/zypp?rev=11506&view=rev
Log:
- force installation by capability if name.arch is specified
(bnc #305445)
- complain if installing by --name and arch is specified
Modified:
trunk/zypper/doc/zypper.8
trunk/zypper/src/Zypper.cc
trunk/zypper/src/install.cc
Modified: trunk/zypper/doc/zypper.8
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=11506&r1=11505&r2=11506&view=diff
==============================================================================
--- trunk/zypper/doc/zypper.8 (original)
+++ trunk/zypper/doc/zypper.8 Mon Oct 27 15:16:04 2008
@@ -158,8 +158,9 @@
The packages can be selected by their name or by a capability they provide.
-Capability is: NAME, or "NAME[OP<EDITION>]", where OP is <, <=, =, >=, or > and
-EDITION is VERSION[-RELEASE], for example: zypper=0.8.8-2.
+Capability is: NAME, or "NAME[.ARCH][OP<EDITION>]", where ARCH is architecture
+code, OP is <, <=, =, >=, or > and EDITION is VERSION[-RELEASE].
+For example: zypper=0.8.8-2.
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).
@@ -170,6 +171,11 @@
This also means that if the package is already installed and newer versions
are available, it will get upgraded to the newest installable version.
+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.
+
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
RPM file by specifying its location in the install command arguments either
Modified: trunk/zypper/src/Zypper.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=11506&r1=11505&r2=11506&view=diff
==============================================================================
--- trunk/zypper/src/Zypper.cc (original)
+++ trunk/zypper/src/Zypper.cc Mon Oct 27 15:16:04 2008
@@ -876,6 +876,8 @@
_command_help = str::form(_(
// TranslatorExplanation the first %s = "package, patch, pattern, product"
// and the second %s = "package"
+ //! \todo A capability is NAME[.ARCH][OP<VERSION>] now,
+ //! the help text will be changed after release
"install (in) [options]