From 5dbe79522e2a20ae2db42570a28f8ab77b9bbc56 Mon Sep 17 00:00:00 2001 From: Jan Kupec Date: Fri, 4 Jan 2008 12:29:01 +0000 Subject: [PATCH] - docs update --- doc/zypper.8 | 49 +++++++++++++++++++++++++++++++++++-------------- src/zypper.cc | 14 +++++++------- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/doc/zypper.8 b/doc/zypper.8 index fa26177..2685011 100644 --- a/doc/zypper.8 +++ b/doc/zypper.8 @@ -1,4 +1,4 @@ -.TH "zypper" "8" "0.9.4" "zypper" "System Tools" +.TH "zypper" "8" "0.9.5" "zypper" "System Tools" .SH "SYNTAX" .LP zypper [\fI\-\-global\-options\fR] <\fBcommand\fR> [\fI\-\-command\-options\fR] [\fBcommand-arguments\fR] @@ -403,28 +403,49 @@ Turns on rug compatibility. See section COMPATIBILITY WITH RUG for details. .I \-n, \-\-non\-interactive Switches to non-interactive mode. In this mode zypper doesn't ask user to type answers to various prompts, but uses default answers automatically. The behaviour of this option is somewhat different than that of options like '--yes', since zypper can answer different answers to different questions. The answers also depend on other options like '--no-gpg-checks'. .TP -.I \-\-no\-gpg\-checks -Ignore GPG check failures and continue. If a GPG issue occurs when using this option zypper prints and logs a warning and automatically continues without interrupting the operation. Use this option with causion, as you can easily overlook security problems by using it. -.TP -.I \-R, \-\-root -Operates on a different root directory. This option influences the location -of the repos.d directory and the meta-data cache directory and also causes rpm -to be run with the --root option to do the actual installation or removal of -packages. Note that the ZYpp lock is still created in the original system, -as well as temporary files. See also the FILES section. - -.TP .I \-D, \-\-reposd\-dir Use the specified directory to look for the repository definition (*.repo) files. The default value is /etc/zypp/repos.d. .TP -.I \-D, \-\-cache\-dir +.I \-C, \-\-cache\-dir Use an alternative directory to look for the repository meta-data cache database file (zypp.db). The default value is /var/cache/zypp. .TP -.I \-D, \-\-raw\-cache\-dir +.I \-\-raw\-cache\-dir Use the specified directory for storing raw copies of repository meta-data files. The default value is /var/cache/zypp/raw. +.LP +Repository Options: +.TP +.I \-\-no\-gpg\-checks +Ignore GPG check failures and continue. If a GPG issue occurs when using this +option zypper prints and logs a warning and automatically continues without +interrupting the operation. Use this option with causion, as you can easily +overlook security problems by using it. +.TP +.I \-p, \-\-plus-repo +Use an additional repository for this operation. The repository aliased tmp# +and named by the specified URI will be added for this operation and removed +at the end. You can specify this option multiple times. +.TP +.I --disable-repositories +Do not read meta-data from repositories. This option will prevent loading of +resolvables from repositories, thus making zypper work only with the installed +resolvables (if --disable-system-resolvables was not specified). +.LP +Target Options: +.TP +.I \-R, \-\-root +Operates on a different root directory. This option influences the location +of the repos.d directory and the meta-data cache directory and also causes rpm +to be run with the --root option to do the actual installation or removal of +packages. Note that the ZYpp lock is still created in the original system, +as well as temporary files. See also the FILES section. +.TP +.I --disable-system-resolvables +This option servers mainly for testing purposes. It will cause zypper to act +as if there were no packages installed in the system. Use with causion as you +can damage your system using this option. .SH "METADATA REFRESH POLICY" .LP diff --git a/src/zypper.cc b/src/zypper.cc index 85e0bf3..8ec86b1 100644 --- a/src/zypper.cc +++ b/src/zypper.cc @@ -128,20 +128,20 @@ void print_main_help(const Zypper & zypper) "\t--table-style, -s\tTable style (integer).\n" "\t--rug-compatible, -r\tTurn on rug compatibility.\n" "\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n" - "\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n" - "\t--root, -R \tOperate on a different root directory.\n" - "\t--reposd-dir, D \tUse alternative repository definition files directory.\n" - "\t--cache-dir, C \tUse alternative meta-data cache database directory.\n" + "\t--reposd-dir, -D \tUse alternative repository definition files directory.\n" + "\t--cache-dir, -C \tUse alternative meta-data cache database directory.\n" "\t--raw-cache-dir \tUse alternative raw meta-data cache directory\n" ); static string help_global_source_options = _( - " Repository Options:\n" + "\tRepository Options:\n" + "\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n" + "\t--plus-repo, -p \tUse an additional repository\n" "\t--disable-repositories\tDo not read meta-data from repositories.\n" - "\t--plus-repo, p Use an additional repository\n" ); - static string help_global_target_options = _(" Target Options:\n" + static string help_global_target_options = _("\tTarget Options:\n" + "\t--root, -R \tOperate on a different root directory.\n" "\t--disable-system-resolvables Do not read installed resolvables\n" ); -- 2.7.4