Author: jkupec Date: Sun Mar 30 15:08:15 2008 New Revision: 9310 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9310&view=rev Log: - rug uses -N for --dry-run, provide it, too 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=9310&r1=9309&r2=9310&view=diff ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Sun Mar 30 15:08:15 2008 @@ -151,7 +151,7 @@ to install or remove to fix them. .TP -.I \-N, \-\-dry-run +.I \-D, \-\-dry-run Test the repair, do not actually do anything to the system. .TP .I \-r, \-\-repo @@ -653,7 +653,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 behaviour, 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 @@ -775,6 +775,13 @@ the operation of commands like search, install, etc to the repository specified by the alias. +.TP +.I \-N, \-\-dry\-run +Zypper uses -D shorthand for this option, but -N is provided for the sake +of compatibility. Zypper (libzypp) implements this option by passing the +\fB\-\-test\fR option to \fBrpm\fR. The option is used in \fBinstall\fR, \fBremove\fR, +\fBupdate\fR, \fBdist-upgrade\fR (not available in rug), and \fBverify\fR commands. + .SH "HOMEPAGE" http://en.opensuse.org/Zypper Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=9310&r1=9309&r2=9310&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Sun Mar 30 15:08:15 2008 @@ -738,6 +738,8 @@ {"debug-solver", no_argument, 0, 0}, {"force-resolution", required_argument, 0, 'R'}, {"dry-run", no_argument, 0, 'D'}, + // rug uses -N shorthand + {"dry-run", no_argument, 0, 'N'}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; @@ -782,6 +784,8 @@ {"debug-solver", no_argument, 0, 0}, {"force-resolution", required_argument, 0, 'R'}, {"dry-run", no_argument, 0, 'D'}, + // rug uses -N shorthand + {"dry-run", no_argument, 0, 'N'}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; @@ -806,7 +810,7 @@ )) % "package, patch, pattern, product" % "package"); break; } - + case ZypperCommand::SRC_INSTALL_e: { static struct option src_install_options[] = { @@ -835,6 +839,8 @@ static struct option verify_options[] = { // rug compatibility option, we have global --non-interactive {"no-confirm", no_argument, 0, 'y'}, + {"dry-run", no_argument, 0, 'D'}, + // rug uses -N shorthand {"dry-run", no_argument, 0, 'N'}, {"repo", required_argument, 0, 'r'}, {"help", no_argument, 0, 'h'}, @@ -847,7 +853,7 @@ "Check whether dependencies of installed packages are satisfied.\n" "\n" " Command options:\n" - "-N, --dry-run Test the repair, do not actually do anything to the system.\n" + "-D, --dry-run Test the repair, do not actually do anything to the system.\n" "-r, --repo Use only specified repositories to install missing packages.\n" ); break; @@ -1069,6 +1075,8 @@ {"debug-solver", no_argument, 0, 0}, {"force-resolution", required_argument, 0, 'R'}, {"dry-run", no_argument, 0, 'D'}, + // rug uses -N shorthand + {"dry-run", no_argument, 0, 'N'}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; @@ -1103,6 +1111,8 @@ {"auto-agree-with-licenses", no_argument, 0, 'l'}, {"debug-solver", no_argument, 0, 0}, {"dry-run", no_argument, 0, 'D'}, + // rug uses -N shorthand + {"dry-run", no_argument, 0, 'N'}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org