svn commit: r1804647 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

[ko...@apache.org]

Author: kotkov
Date: Thu Aug 10 09:23:26 2017
New Revision: 1804647

URL: http://svn.apache.org/viewvc?rev=1804647&view=rev
Log:
fsfs: Prohibit using new 'compression' and deprecated 'compression-level'
config options together.

This should limit the amount of possible configurations that we need to
handle, and also it disallows a (potentially implicit) override of the
'compression-level' option when using Subversion 1.10.

* subversion/libsvn_fs_fs/fs_fs.c
  (read_config): Error out if both 'compression' and 'compression-level'
   options are set.

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1804647&r1=1804646&r2=1804647&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Thu Aug 10 09:23:26 2017
@@ -872,9 +872,14 @@ read_config(fs_fs_data_t *ffd,
       svn_config_get(config, &compression_level_val,
                      CONFIG_SECTION_DELTIFICATION,
                      CONFIG_OPTION_COMPRESSION_LEVEL, NULL);
-      if (compression_val)
+      if (compression_val && compression_level_val)
+        {
+          return svn_error_create(SVN_ERR_BAD_CONFIG_VALUE, NULL,
+                                  _("The 'compression' and 'compression-level' "
+                                    "config options are mutually exclusive"));
+        }
+      else if (compression_val)
         {
-          /* 'compression' option overrides deprecated 'compression-level'. */
           SVN_ERR(parse_compression_option(&ffd->delta_compression_type,
                                            &ffd->delta_compression_level,
                                            compression_val));