X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=zypp.conf;h=0e089e0e48a79d0bc52acb386566630ecfe385ae;hb=fff2dcb58ab85b590c7c3d511532fd5a3e5460e4;hp=8c09b0fe1809cecd9b969973c370457f857fc6ac;hpb=b1ca54e93266d8e691cc50eaf8a3f6d1ce7ed17a;p=platform%2Fupstream%2Flibzypp.git

diff --git a/zypp.conf b/zypp.conf
index 8c09b0f..0e089e0 100644
--- a/zypp.conf
+++ b/zypp.conf
@@ -76,6 +76,16 @@
 ##
 # reposdir = /etc/zypp/repos.d
 
+##
+## Path where the known services .service files are kept
+##
+## Valid values: A directory
+## Default value: {configdir}/services.d
+##
+## Changing this invalidates all known services
+##
+# reposdir = /etc/zypp/service.d
+
 
 ##
 ## Whether repository urls should be probed when added
@@ -112,20 +122,6 @@
 
 
 ##
-## Whether to consider using a .patch.rpm when downloading a package
-##
-## Valid values: boolean
-## Default value: true
-##
-## Using a patch rpm will decrease the download size for package updates
-## since it does not contain all files of the package but only the changed
-## ones. The .patch.rpm is ready to be installed immediately after download.
-## There is no further processing needed, as it is for a .delta.rpm.
-##
-# download.use_patchrpm = true
-
-
-##
 ## Whether to consider using a .delta.rpm when downloading a package
 ##
 ## Valid values: boolean
@@ -139,26 +135,35 @@
 ##
 # download.use_deltarpm = true
 
-
 ##
-## Defining directory for equivalent vendors
+## Whether to consider using a deltarpm even when rpm is local
 ##
-## Valid values: A directory
-## Default value: {configdir}/vendors.d
+## Valid values: boolean
+## Default value: false
 ##
-# vendordir = /etc/zypp/vendors.d
-
+## This option has no effect unless download.use_deltarpm is set true.
+##
+#  download.use_deltarpm.always = false
 
 ##
-## Path where additional product information, .prod files are kept
+## Defining directory which contains vendor description files.
 ##
-## Valid values: A directory
-## Default value: {configdir}/products.d
+## One file in this directory reflects a group of equivalent vendors. e.G.:
+## (filename is "nvidia" but could be any other name):
+## ------------------------- file contains begin -----------------------
+## [main]
+##
+## vendors = nvidia,suse,opensuse
 ##
-## Changing this is not recommended, as the directory might
-## be populated by packages dropping files to /etc/zypp/products.d.
+## ------------------------- file contains end -----------------------
+## Libzypp makes an string comparision (like strncmp, case-insensitive)
+## whereas the beginning of the strings are compared only.
+## e.G. vendor "opensuse11.0" is compatible to "openSuSE".
+##
+## Valid values: A directory
+## Default value: {configdir}/vendors.d
 ##
-# productsdir = /etc/zypp/products.d
+# vendordir = /etc/zypp/vendors.d
 
 
 ##
@@ -172,6 +177,26 @@
 # solver.onlyRequires = false
 
 ##
+## This file contains requirements/conflicts which fulfill the
+## needs of a running system.
+## For example the system would be broken if not glibc or kernel is
+## installed.
+## So the user will be informed if these packages will be deleted.
+##
+## format: Each line represents one dependency:
+## e.g.
+## requires:kernel
+## requires:glibc
+##
+# solver.checkSystemFile = /etc/zypp/systemCheck
+
+##
+## Packages which are parallel installable with
+## diffent versions
+##
+# multiversion = kernel-default,kernel-smp
+
+##
 ## Path to locks file. If not exist then is create.
 ## In this file is saved also UI locks.
 ##
@@ -213,4 +238,47 @@
 ##
 # update.scriptsdir = /var/adm/update-scripts
 
+##
+## Options for package installation: excludedocs
+##
+## Don't install any files which are marked as documentation.
+##
+## Valid values:  boolean
+## Default value: no
+##
+# rpm.install.excludedocs = no
+
+##
+## Location of history log file.
+##
+## The history log is described at
+## http://en.opensuse.org/Libzypp/Package_History
+##
+## Valid values: absolute path to a file
+## Default value: /var/log/zypp/history
+##
+# history.logfile = /var/log/zypp/history
 
+##
+## Global credentials directory path.
+##
+## If a URL contains ?credentials=<filename> parameter, the credentials will
+## be stored and looked for in a file named <filename> in this directory.
+##
+## Valid values: absolute path to a directory
+## Default value: /etc/zypp/credentials.d
+##
+# credentials.global.dir = /etc/zypp/credentials.d
+
+##
+## Global credentials catalog file path.
+##
+## This file contains a catalog of all known user credentials which were
+## not stored via the ?credentials=<filename> URL parameter, i.e. passed
+## in URL as username:password component, or entered by user in
+## an authentication dialog.
+##
+## Valid values: absolute path to a file
+## Default value: /etc/zypp/credentials.cat
+##
+# credentials.global.file = /etc/zypp/credentials.cat