Deprecate chown_changes_files in favor of restrict_changes_files.

Closes: #821960

1 files changed, 9 insertions, 2 deletions

diff --git a/mini-dinstall b/mini-dinstall
index f9d8ec1..9874ee8 100755
--- a/mini-dinstall
+++ b/mini-dinstall
@@ -384,7 +384,8 @@ class DistOptionHandler:
             'post_install_script': ['str', None],
             'pre_install_script': ['str', None],
             'dynamic_reindex': ['bool', True],
-            'chown_changes_files': ['bool', True],
+            'restrict_changes_files': ['bool', None],
+            'chown_changes_files': ['bool', None],
             'keep_old': ['bool', False],
             'mail_on_success': ['bool', True],
             'tweet_on_success': ['bool', False],
@@ -435,6 +436,12 @@ for dist in list(distributions.keys()):
     distributions[dist] = distoptionhandler.get_option_map(dist)
     if distributions[dist]['archive_style'] not in ('simple-subdir', 'flat'):
         raise DinstallException('Unknown archive style "%s"' % distributions[dist]['archive_style'])
+    if distributions[dist]['chown_changes_files'] is not None:
+        logger.warn("'chown_changes_files' is deprecated, please use 'restrict_changes_files' instead")
+        if distributions[dist]['restrict_changes_files'] is None:
+            distributions[dist]['restrict_changes_files'] = distributions[dist]['chown_changes_files']
+    if distributions[dist]['restrict_changes_files'] is None:
+            distributions[dist]['restrict_changes_files'] = True
 
 logger.debug("Distributions: %s" % distributions)
 
@@ -803,7 +810,7 @@ class ArchiveDir:
             self._logger.exception('Failed to process "%s"' % changefilename)
             self._reject_changefile(changefilename, changefile, e)
             return False
-        if self._chown_changes_files:
+        if self._restrict_changes_files:
             do_chmod(changefilename, 0o600)
         target = os.path.join(self._dir, os.path.basename(changefilename))
         # the final step