- changes & docs

diff --git a/doc/zypper.8 b/doc/zypper.8
index 18a836e..e703e2a 100644 (file)
--- a/doc/zypper.8
+++ b/doc/zypper.8
@@ -333,6 +333,12 @@ add the \-\-test option to the rpm commands run by the remove command.
 .TP
 .B list-updates (lu) [options]
 List available updates.
+
+This command will list only installable updates, i.e. updates which have
+no dependency problems, or which do not change package vendor. This list
+is what the \fBupdate\fR command will propose to install. To list
+all packages for which newer version are available, use \fI\-\-all\fR option.
+
 .TP
 \fI\-t, --type\fR <type>
 Type of package (default: package). See Package Managemet Commands subsection
@@ -341,10 +347,22 @@ for the list of available package types.
 \fI\-r, \-\-repo\fR <alias|#|URI>
 List only updates from 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
+they are installable or not.
+.TP
+.I \-\-best\-effort
+See the \fBupdate\fR command for description.
+
 
 .TP
 .B update (up) [options] [packagename] ...
-Update installed packages with patches or newer version, where applicable.
+Update installed packages with newer versions, where possible.
+
+This command will not update packages which would require change of package
+vendor unless the vendor is specified in /etc/zypp/vendors.d, or which would
+require manual resolution of problems with dependencies.
 
 To update individual packages, specify one or more package names. You can
 use the '*' and '?' wildcard characters in the package names to specify
@@ -383,11 +401,26 @@ The default behavior is 'no-force'. If this option is specified, it takes the pr
 .I \-D, \-\-dry\-run
 Test the update, do not actually install or update any package. This option will
 add the \-\-test option to the rpm commands run by the update command.
+.TP
+.I \-\-best\-effort
+Do a 'best effort' approach to update. This method does not explicitly select
+packages with best version and architecture, but instead requests installation
+of a package with higher version than the installed one and leaves the rest
+on the dependency solver. This method is always used for packages, and is
+optional for products and patterns. It is not applicable to patches.
+
 
 .TP
 .B list-patches (lp) [options]
 List all available needed patches.
 
+If there are patches that affect the package management itself, only those will
+be listed, and you will be informed if also other patches are available. After
+installing the package management patches, the other needed patches will
+be listed.
+
+This command is similar to 'zypper list-updates -t patch'.
+
 .TP
 .I \-r, --repo <alias|#|URI>
 List only patches from the specified repository.
@@ -397,6 +430,11 @@ List only patches from the specified repository.
 .B patch [options]
 Install all available needed patches.
 
+If there are patches that affect the package management itself, those will
+be installed first and you will be asked to run the \fBpatch\fR command again.
+
+This command is similar to 'zypper update -t patch'.
+
 .TP
 .I \-r, \-\-repo <alias|#|URI>
 Work only with specified repository.

diff --git a/package/zypper.changes b/package/zypper.changes
index 1d499b8..4473d16 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Mon Sep 29 12:08:12 CEST 2008 - jkupec@suse.cz
+
+- show in 'lu' what will 'up' actually propose to install
+- new --all/-a option for 'lu' to show the original raw list of
+  packages for which newer versions exist.
+  (bnc #395480)
+
+-------------------------------------------------------------------
 Mon Sep 29 10:47:08 CEST 2008 - jkupec@suse.cz
 
 - proper error message if the repository type can't be determined
@@ -9,7 +17,7 @@ Mon Sep 29 10:47:08 CEST 2008 - jkupec@suse.cz
 Sun Sep 28 22:07:18 CEST 2008 - jkupec@suse.cz
 
 - 'update' and 'list-updates' now defaults to '-t package'
-  patch/list-patches commands added to install/list patches
+- patch/list-patches commands added to install/list patches
   (bnc #395480)
 - r11191
 

diff --git a/src/solve-commit.cc b/src/solve-commit.cc
index bd06cae..83c6b15 100755 (executable)
--- a/src/solve-commit.cc
+++ b/src/solve-commit.cc
@@ -1185,8 +1185,8 @@ void solve_and_commit (Zypper & zypper)
     else if (zypper.exitCode() == ZYPPER_EXIT_INF_RESTART_NEEDED)
       zypper.out().warning(
         _("One of installed patches affects the package"
-          " manager itself, thus it requires its restart before executing"
-          " any further operations."),
+          " manager itself. Run this command once more to install any other"
+          " needed patches."),
         Out::QUIET, Out::TYPE_NORMAL); // don't show this to machines
   }
 }