- use -D for --dry-run (-d will be --download-only)

- update man page

diff --git a/doc/zypper.8 b/doc/zypper.8
index e033d84..894cddf 100644 (file)
--- a/doc/zypper.8
+++ b/doc/zypper.8
@@ -1,4 +1,4 @@
-.TH "zypper" "8" "0.9.5" "zypper" "System Tools"
+.TH "zypper" "8" "0.9.6" "zypper" "System Tools"
 .SH "SYNTAX"
 .LP
 zypper [\fI\-\-global\-options\fR] <\fBcommand\fR> [\fI\-\-command\-options\fR] [\fBcommand-arguments\fR]
@@ -122,6 +122,10 @@ 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 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> ...
@@ -170,6 +174,10 @@ Create solver test case for debugging. See the install command for details.
 .I \-R, \-\-force\-resolution
 Force the solver to find a solution, even if it would mean removing all packages
 with unfulfilled requirements.
+.TP
+.I \-D, \-\-dry\-run
+Test the removal of packages, do not actually remove anything. This option will
+add the \-\-test option to the rpm commands run by the remove command.
 
 .TP
 .B update (up) [options]
@@ -198,6 +206,10 @@ Create solver test case for debugging. See the install command for details.
 .I \-R, \-\-force\-resolution
 Force the solver to find a solution, even if it would mean removing all packages
 with unfulfilled requirements.
+.TP
+.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.
 
 .B NOTE:
 Zypper prefers to update only those packages for which a patch
@@ -220,7 +232,10 @@ Automatically say 'yes' to third party license confirmation prompt. By using thi
 .TP
 .I      \-\-debug\-solver
 Create solver test case for debugging. See the install command for details.
-
+.TP
+.I \-D, \-\-dry\-run
+Test the upgrade, do not actually install or update any package. This option will
+add the \-\-test option to the rpm commands run by the dist-upgrade command.
 
 .TP
 \fBsearch\fR (\fBse\fR) [\fIoptions\fR] [\fBquerystring\fR] ...

diff --git a/src/zypper.cc b/src/zypper.cc
index 176f435..d117ba8 100644 (file)
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -666,7 +666,7 @@ void Zypper::processCommandOptions()
       {"agree-to-third-party-licenses",  no_argument,  0, 0},
       {"debug-solver",              no_argument,       0, 0},
       {"force-resolution",          required_argument, 0, 'R'},
-      {"dry-run",                   no_argument,       0, 'd'},
+      {"dry-run",                   no_argument,       0, 'D'},
       {"help",                      no_argument,       0, 'h'},
       {0, 0, 0, 0}
     };
@@ -691,7 +691,7 @@ void Zypper::processCommandOptions()
       "                                See 'man zypper' for more details.\n"
       "    --debug-solver              Create solver test case for debugging\n"
       "-R, --force-resolution <on|off> Force the solver to find a solution (even agressive)\n"
-      "-d, --dry-run                   Test the installation, do not actually install\n"
+      "-D, --dry-run                   Test the installation, do not actually install\n"
     )) % "package, patch, pattern, product" % "package");
     break;
   }
@@ -710,7 +710,7 @@ void Zypper::processCommandOptions()
       {"no-confirm", no_argument,       0, 'y'},
       {"debug-solver", no_argument,     0, 0},
       {"force-resolution", required_argument, 0, 'R'},
-      {"dry-run",    no_argument,       0, 'd'},
+      {"dry-run",    no_argument,       0, 'D'},
       {"help",       no_argument,       0, 'h'},
       {0, 0, 0, 0}
     };
@@ -731,7 +731,7 @@ void Zypper::processCommandOptions()
       "-C, --capability                Select resolvables by capability\n"
       "    --debug-solver              Create solver test case for debugging\n"  
       "-R, --force-resolution <on|off> Force the solver to find a solution (even agressive)\n"
-      "-d, --dry-run                   Test the removal, do not actually remove\n"
+      "-D, --dry-run                   Test the removal, do not actually remove\n"
     )) % "package, patch, pattern, product" % "package");
     break;
   }
@@ -938,7 +938,7 @@ void Zypper::processCommandOptions()
       {"best-effort",               no_argument,       0, 0},
       {"debug-solver",              no_argument,       0, 0},
       {"force-resolution",          required_argument, 0, 'R'},
-      {"dry-run",                   no_argument,       0, 'd'},
+      {"dry-run",                   no_argument,       0, 'D'},
       {"help", no_argument, 0, 'h'},
       {0, 0, 0, 0}
     };
@@ -961,7 +961,7 @@ void Zypper::processCommandOptions()
       "    --best-effort               Do a 'best effort' approach to update, updates to a lower than latest-and-greatest version are also acceptable\n"
       "    --debug-solver              Create solver test case for debugging\n"
       "-R, --force-resolution <on|off> Force the solver to find a solution (even agressive)\n"
-      "-d, --dry-run                   Test the update, do not actually update\n"
+      "-D, --dry-run                   Test the update, do not actually update\n"
     )) % "package, patch, pattern, product" % "patch");
     break;
   }
@@ -972,7 +972,7 @@ void Zypper::processCommandOptions()
       {"repo",                      required_argument, 0, 'r'},
       {"auto-agree-with-licenses",  no_argument,       0, 'l'},
       {"debug-solver",              no_argument,       0, 0},
-      {"dry-run",                   no_argument,       0, 'd'},
+      {"dry-run",                   no_argument,       0, 'D'},
       {"help", no_argument, 0, 'h'},
       {0, 0, 0, 0}
     };
@@ -988,7 +988,7 @@ void Zypper::processCommandOptions()
       "-l, --auto-agree-with-licenses  Automatically say 'yes' to third party license confirmation prompt.\n"
       "                                See man zypper for more details.\n"
       "    --debug-solver              Create solver test case for debugging\n"
-      "-d, --dry-run                   Test the upgrade, do not actually upgrade\n"
+      "-D, --dry-run                   Test the upgrade, do not actually upgrade\n"
     );
     break;
   }