##// END OF EJS Templates
svn-support: Use utf-8 to encode mod_dav_svn configuration before writing to disk....
Martin Bornhold -
r830:7ca2d1db default
parent child Browse files
Show More
@@ -1,86 +1,88 b''
1 1 # -*- coding: utf-8 -*-
2 2
3 3 # Copyright (C) 2016-2016 RhodeCode GmbH
4 4 #
5 5 # This program is free software: you can redistribute it and/or modify
6 6 # it under the terms of the GNU Affero General Public License, version 3
7 7 # (only), as published by the Free Software Foundation.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU Affero General Public License
15 15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
16 16 #
17 17 # This program is dual-licensed. If you wish to learn more about the
18 18 # RhodeCode Enterprise Edition, including its added features, Support services,
19 19 # and proprietary license terms, please see https://rhodecode.com/licenses/
20 20
21 import codecs
21 22 import logging
22 23 import os
23 24
24 25 from pyramid.renderers import render
25 26
26 27 from rhodecode.lib.utils import get_rhodecode_realm
27 28 from rhodecode.model.db import RepoGroup
28 29 from rhodecode.model.settings import SettingsModel
29 30 from . import config_keys
30 31
31 32
32 33 log = logging.getLogger(__name__)
33 34
34 35
35 36 def generate_mod_dav_svn_config(settings):
36 37 """
37 38 Generate the configuration file for use with subversion's mod_dav_svn
38 39 module. The configuration has to contain a <Location> block for each
39 40 available repository group because the mod_dav_svn module does not support
40 41 repositories organized in sub folders.
41 42 """
42 43 parent_path_root = SettingsModel().get_ui_by_section_and_key(
43 44 'paths', '/').ui_value
44 45 config = _render_mod_dav_svn_config(
45 46 parent_path_root=parent_path_root,
46 47 list_parent_path=settings[config_keys.list_parent_path],
47 48 location_root=settings[config_keys.location_root],
48 49 repo_groups=RepoGroup.get_all_repo_groups())
49 50 _write_mod_dav_svn_config(config, settings[config_keys.config_file_path])
50 51
51 52
52 53 def _render_mod_dav_svn_config(
53 54 parent_path_root, list_parent_path, location_root, repo_groups):
54 55 """
55 56 Render mod_dav_svn configuration to string.
56 57 """
57 58 repo_group_paths = []
58 59 for repo_group in repo_groups:
59 60 group_path = repo_group.full_path_splitted
60 61 location = os.path.join(location_root, *group_path)
61 62 parent_path = os.path.join(parent_path_root, *group_path)
62 63 repo_group_paths.append((location, parent_path))
63 64
64 65 context = {
65 66 'location_root': location_root,
66 67 'parent_path_root': parent_path_root,
67 68 'repo_group_paths': repo_group_paths,
68 69 'svn_list_parent_path': list_parent_path,
69 70 'rhodecode_realm': get_rhodecode_realm(),
70 71 }
71 72
72 73 # Render the configuration template to string.
73 74 template = 'rhodecode:svn_support/templates/mod-dav-svn.conf.mako'
74 75 return render(template, context)
75 76
76 77
77 78 def _write_mod_dav_svn_config(config, filepath):
78 79 """
79 80 Write mod_dav_svn config to file. Log on exceptions but do not raise.
80 81 """
81 82 try:
82 with open(filepath, 'w') as file_:
83 file_.write(config)
83 with codecs.open(filepath, 'w', encoding='utf-8') as f:
84 f.write(config)
84 85 except Exception:
85 86 log.exception(
86 'Can not write mod_dav_svn configuration to "%s"', filepath)
87 'Exception while writing mod_dav_svn configuration to '
88 '"%s"', filepath)
General Comments 0
You need to be logged in to leave comments. Login now