- docs update

diff --git a/doc/zypper.8 b/doc/zypper.8
index 95893ef..dfb9ec4 100644 (file)
--- a/doc/zypper.8
+++ b/doc/zypper.8
@@ -366,6 +366,18 @@ Ignore GPG check failures and continue. If a GPG issue occurs when using this op
 .TP
 .I \-R, \-\-root <dir>
 Operates on a different root directory.
+.TP
+.I \-D, \-\-reposd\-dir <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 <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 <dir>
+Use the specified directory for storing raw copies of repository meta-data files.
+The default value is /var/cache/zypp/raw.
 
 .SH "METADATA REFRESH POLICY"
 .LP
@@ -408,7 +420,11 @@ kde* < 3.5
 .SH "FILES"
 .TP
 .B /etc/zypp/repos.d
-Directory containing repository configuration (*.repo) files. You can use the \fBrepo\fR commands to manipulate these files, or you can edit them yourself. In either case, after doing the modifications, executing \fBzypper refresh\fR is strongly recommended.
+Directory containing repository definition (*.repo) files.
+You can use the \fBrepo\fR commands to manipulate these files, or you can edit
+them yourself. In either case, after doing the modifications, executing
+\fBzypper refresh\fR is strongly recommended.
+Use the \-\-reposd\-dir global option to use an alternative directory for this purpose. 
 .TP
 .B /etc/zypp/zypp.conf
 ZYpp configuration file.
@@ -418,9 +434,12 @@ File with package lock definitions, see the section LOCKS.
 .TP
 .B /var/cache/zypp/raw
 Directory for storing raw metadata contained in repositories.
+Use the \-\-raw\-cache\-dir global option to use an alternative directory for this purpose.
 .TP
 .B /var/cache/zypp/zypp.db
 Sqlite database file containing pre-parsed metadata of all repositories.
+Use the \-\-cache\-dir global option to use an alternative directory
+for the zypp.db file.
 .TP
 .B ~/.zypper_history
 Command history for the shell.

diff --git a/src/zypper.cc b/src/zypper.cc
index 5ea4429..4738a60 100644 (file)
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -82,10 +82,9 @@ void process_globals(int argc, char **argv)
     {"non-interactive", no_argument,       0, 'n'},
     {"no-gpg-checks",   no_argument,       0,  0 },
     {"root",            required_argument, 0, 'R'},
-    {"cache-dir",       required_argument, 0, 'C'},
     {"reposd-dir",      required_argument, 0, 'D'},
+    {"cache-dir",       required_argument, 0, 'C'},
     {"raw-cache-dir",   required_argument, 0,  0 },
-    {"zypp-dirs",       required_argument, 0, 'Z'},
     {"opt",             optional_argument, 0, 'o'},
     {"disable-system-resolvables", optional_argument, 0, 'o'},
     {0, 0, 0, 0}
@@ -106,7 +105,11 @@ void process_globals(int argc, char **argv)
     "\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 <dir>\tOperate on a different root directory.\n");
+    "\t--root, -R <dir>\tOperate on a different root directory.\n"
+    "\t--reposd-dir, D <dir>\tUse alternative repository definition files directory.\n"
+    "\t--cache-dir, C <dir>\tUse alternative meta-data cache database directory.\n"
+    "\t--raw-cache-dir <dir>\tUse alternative raw meta-data cache directory\n"
+  );
 
   if (gopts.count("rug-compatible"))
     gSettings.is_rug_compatible = true;
@@ -156,14 +159,14 @@ void process_globals(int argc, char **argv)
     gSettings.root_dir = gopts["root"].front();
   }
 
-  if (gopts.count("cache-dir")) {
-    gSettings.rm_options.repoCachePath = gopts["cache-dir"].front();
-  }
-
   if (gopts.count("reposd-dir")) {
     gSettings.rm_options.knownReposPath = gopts["reposd-dir"].front();
   }
 
+  if (gopts.count("cache-dir")) {
+    gSettings.rm_options.repoCachePath = gopts["cache-dir"].front();
+  }
+
   if (gopts.count("raw-cache-dir")) {
     gSettings.rm_options.repoRawCachePath = gopts["raw-cache-dir"].front();
   }