[zypp-commit] r9327 - in /trunk/zypper: doc/zypper.8 src/zypper-misc.cc
Author: jkupec
Date: Tue Apr 1 21:47:12 2008
New Revision: 9327
URL: http://svn.opensuse.org/viewcvs/zypp?rev=9327&view=rev
Log:
- disable the --force-resolution by default also for 'update'
(bnc #369980)
- will check how rug behaves later
Modified:
trunk/zypper/doc/zypper.8
trunk/zypper/src/zypper-misc.cc
Modified: trunk/zypper/doc/zypper.8
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=9327&r1=9326&r2=9327&view=diff
==============================================================================
--- trunk/zypper/doc/zypper.8 (original)
+++ trunk/zypper/doc/zypper.8 Tue Apr 1 21:47:12 2008
@@ -199,7 +199,11 @@
.TP
.I \-R, \-\-force\-resolution
Force the solver to find a solution, even if it would mean removing all packages
-with unfulfilled requirements.
+with unfulfilled requirements. Otherwise it reports
+a dependency problem and prompt the user to resolve it manually.
+
+The default value is 'on' in the interactive mode and 'off' in the
+non-interactive mode. If this option is specified, it takes the preference.
.TP
.I \-D, \-\-dry\-run
Test the removal of packages, do not actually remove anything. This option will
@@ -232,7 +236,10 @@
.TP
.I \-R, \-\-force\-resolution
Force the solver to find a solution, even if it would mean removing all packages
-with unfulfilled requirements.
+with unfulfilled requirements. Otherwise it reports
+a dependency problem and prompt the user to resolve it manually.
+
+The default value is 'off'. If this option is specified, it takes the preference.
.TP
.I \-D, \-\-dry\-run
Test the update, do not actually install or update any package. This option will
@@ -659,7 +666,7 @@
.LP
zypper is designed to be compatible with rug, which is a command\-line interface to the ZENworks Linux Management (ZLM) agent. Compared to rug, zypper does not need the ZLM daemon to run, and is intented to provide more and improved functionality. Following is a list of zypper-rug command aliases, supported rug command line options, and compatibility notes. See also compatibility notes in descriptions of zypper commands.
.LP
-To enable rug compatible behavior, use the \-r or \-\-rug\-compatible global option with each command.
+To enable rug-compatible behavior, use the \-r or \-\-rug\-compatible global option with each command.
.SS Service Management Commands
.LP
@@ -700,7 +707,7 @@
.TP
.I \-R, \-\-force\-resolution
participants (1)
-
jkupec@svn.opensuse.org