Attachment #10161 for bug #38938

View | Details | Raw Unified | Return to bug 38938
Collapse All | Expand All




	sys.exit(1)


SCOPE = ['normal', 'ldap', 'schedule', 'forced', 'custom', 'default']


if MYPY:

	:param filename: File name for text database file.
	:param write_registry: The UCR level used for writing.
	"""
	NORMAL, LDAP, SCHEDULE, FORCED, CUSTOM, DEFAULTS = range(6)
	LAYER_PRIORITIES = (FORCED, SCHEDULE, LDAP, NORMAL, CUSTOM, DEFAULTS)
	PREFIX = '/etc/univention'
	BASES = {
		NORMAL: 'base.conf',
		LDAP: 'base-ldap.conf',
		SCHEDULE: 'base-schedule.conf',
		FORCED: 'base-forced.conf',
		DEFAULTS: 'base-defaults.conf',
	}

	def __init__(self, filename=None, write_registry=NORMAL):

			filename = self.file
		else:
			filename = os.path.join(ConfigRegistry.PREFIX, ConfigRegistry.BASES[reg])
		if reg == ConfigRegistry.DEFAULTS:
			return _DefaultConfigRegistry(self, filename=filename)
		return _ConfigRegistry(filename=filename)

	def load(self):

		Check if registry key is set.

		.. deprecated:: 3.1
			Use `in`.
		"""
		if write_registry_only:
			registry = self._registry[self.scope]

		"""Return sub registry content as string."""
		return '\n'.join(['%s: %s' % (key, self.remove_invalid_chars(val)) for key, val in sorted(self.items())])


class _DefaultConfigRegistry(_ConfigRegistry):

	def __init__(self, parent, filename=None):
		super(_DefaultConfigRegistry, self).__init__(filename)
		self.parent = parent


# vim:set sw=4 ts=4 noet:




import sys
import re
import time
from univention.config_registry.backend import exception_occured, SCOPE, ConfigRegistry, _DefaultConfigRegistry
from univention.config_registry.handler import run_filter, ConfigHandlers
from univention.config_registry.misc import validate_key, escape_value
from univention.config_registry.filters import filter_shell, filter_keys_only, filter_sort

	# diversion is (re-)done when >= 1.
	handlers.register(args[0], ucr)
	# handlers.commit((ucr, {}))
	_register_variable_default_values(ucr)


def handler_unregister(args, opts=dict()):

	cur = handlers.update()  # cache must be current
	obsolete = handlers.unregister(args[0], ucr)
	handlers.update_divert(cur - obsolete)
	_register_variable_default_values(ucr)


def handler_filter(args, opts=dict()):

			print('E: invalid regular expression: %s' % (ex,), file=sys.stderr)
			sys.exit(1)

	info = _get_config_registry_info()
	# created
	import univention.config_registry_info as cri  # pylint: disable-msg=W0403
	cri.set_language('en')
	info = cri.ConfigRegistryInfo(install_mode=False)

	category = opts.get('category', None)
	if category and not info.get_category(category):

	"""
	ucr = ConfigRegistry()
	ucr.load()
	info = _get_config_registry_info()
	# created
	import univention.config_registry_info as cri  # pylint: disable-msg=W0403
	cri.set_language('en')
	info = cri.ConfigRegistryInfo(install_mode=False)

	for arg in args:
		try:

	sys.exit(1)


def _get_config_registry_info():
	# Import located here, because on module level, a circular import would be
	# created
	import univention.config_registry_info as cri  # pylint: disable-msg=W0403
	cri.set_language('en')
	return cri.ConfigRegistryInfo(install_mode=False)


def _register_variable_default_values(ucr):
	"""Create base-default.conf layer containig all default values"""
	info = _get_config_registry_info()
	defaults = _DefaultConfigRegistry(ucr, '/etc/univention/base-defaults.conf')
	for key, variable in info.get_variables().items():
		value = variable.get('Default')
		if value:
			defaults[key] = value
	defaults.save()


HANDLERS = {
	'set': (handler_set, 1),
	'unset': (handler_unset, 1),
- 
UCR variables
--
.../python/univention/config_registry/backend.py   | 31 ++++++++++++++++++++++
1 file changed, 31 insertions(+)

(-)a/base/univention-config-registry/python/univention/config_registry/backend.py (-2 / +31 lines)

Lines 38-43 import errno	Link Here

import time

import time

from collections import MutableMapping

from collections import MutableMapping

import six

import six

from univention.config_registry.handler import run_filter

try:

try:

	from typing import overload, Any, Dict, IO, Iterator, List, NoReturn, Optional, Set, Tuple, Type, TypeVar, Union  # noqa F401

	from typing import overload, Any, Dict, IO, Iterator, List, NoReturn, Optional, Set, Tuple, Type, TypeVar, Union  # noqa F401

	from types import TracebackType  # noqa

	from types import TracebackType  # noqa

Lines 670-674 class _DefaultConfigRegistry(_ConfigRegistry):	Link Here

670

		super(_DefaultConfigRegistry, self).__init__(filename)

673

		super(_DefaultConfigRegistry, self).__init__(filename)

671

		self.parent = parent

674

		self.parent = parent

672

675

676

	def __getitem__(self, key):  # type: ignore

677

		value = super(_DefaultConfigRegistry, self).__getitem__(key)

678

		try:

679

			return run_filter(value, self.parent)

680

		except RuntimeError:  # maximum recursion depth exceeded

681

			return ''

682

683

	# Implement the dict contract...

684

	# TODO: copy(), viewitems(), viewvalues()

685

686

	def get(self, key, default=None):

687

		try:

688

			return self[key]

689

		except KeyError:

690

			return default

691

692

	def iteritems(self):

693

		return dict((key, self[key]) for key in self).iteritems()

694

695

	def items(self):

696

		return dict((key, self[key]) for key in self).items()

697

698

	def values(self):

699

		return dict((key, self[key]) for key in self).values()

700

701

	def itervalues(self):

702

		return dict((key, self[key]) for key in self).itervalues()

703

673

704

674

# vim:set sw=4 ts=4 noet:

705

# vim:set sw=4 ts=4 noet:

675

676

--

677

.../python/univention/config_registry/frontend.py            | 12 ++++++++----

706

.../python/univention/config_registry/frontend.py            | 12 ++++++++----

678

1 file changed, 8 insertions(+), 4 deletions(-)

707

1 file changed, 8 insertions(+), 4 deletions(-)





REPLOG_FILE = '/var/log/univention/config-registry.replog'

_SHOW_EMPTY, _SHOW_DESCRIPTION, _SHOW_SCOPE, _SHOW_CATEGORIES, _SHOW_DEFAULT = (1 << _ for _ in range(5))


class UnknownKeyException(Exception):

		yield ucr.get(args[0], '')


def variable_info_string(key, value, variable_info, scope=None, details=_SHOW_DESCRIPTION, default=None):
	# type: (str, Optional[str], Any, int, int) -> str
	"""
	Format UCR variable key, value, description, scope, categories and default value.

	:param key: UCR variable name.
	:param value: UCR variable value.
	:param variable_info: Description object.
	:param scope: UCS layer.
	:param details: bit-field for detail-level.
	:param default: UCR variable default value.
	:returns: formatted string
	"""
	if value is None and not variable_info:

	if variable_info and _SHOW_CATEGORIES & details:
		info.append(' Categories: ' + variable_info.get('categories', 'none'))

	if variable_info and _SHOW_DEFAULT & details:
		info.append(' Default: ' + variable_info.get('default', '(not set)'))

	if (_SHOW_CATEGORIES | _SHOW_DESCRIPTION) & details:
		info.append('')


			yield variable_info_string(
				arg, ucr.get(arg, None),
				info.get_variable(arg),
				details=_SHOW_EMPTY | _SHOW_DESCRIPTION | _SHOW_CATEGORIES | _SHOW_DEFAULT)
		except UnknownKeyException as ex:
			print(ex, file=sys.stderr)

- 
--
.../univention-management-console-module-ucr/umc/js/ucr.js     | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)

(-)a/management/univention-management-console-module-ucr/umc/js/ucr.js (-2 / +9 lines)

Lines 99-104 define([	Link Here

	//			description: _( 'Categories that the UCR variable is associated with' ),

	//			description: _( 'Categories that the UCR variable is associated with' ),

100

	//			label: _( 'Categories' ),

100

	//			label: _( 'Categories' ),

101

	//			dynamicValues: 'ucr/categories'

101

	//			dynamicValues: 'ucr/categories'

102

			}, {

103

				type: TextBox,

104

				name: 'default',

105

				description: _('Pattern of the default value of the UCR variable if it is unset'),

106

				readonly: true,

107

				label: _('Default value (pattern)')

102

}];

108

}];

103

109

104

			var buttons = [{

110

			var buttons = [{

Lines 116-122 define([	Link Here

116

})

122

})

117

}];

123

}];

118

124

119

			var layout = ['key', 'value', 'description'];//, ['categories']];

125

			var layout = ['key', 'value', 'description', 'default'];//, ['categories']];

120

126

121

			this._form = this.own(new Form({

127

			this._form = this.own(new Form({

122

				widgets: widgets,

128

				widgets: widgets,

Lines 173-178 define([	Link Here

173

		newVariable: function() {

179

		newVariable: function() {

174

			this.set('title', _('Add UCR variable'));

180

			this.set('title', _('Add UCR variable'));

175

			this._form._widgets.key.set('disabled', false);

181

			this._form._widgets.key.set('disabled', false);

182

			this._form._widgets.default.set('visible', false);

176

			this.clearForm();

183

			this.clearForm();

177

			this.standby(false);

184

			this.standby(false);

178

			this.show();

185

			this.show();

Lines 181-186 define([	Link Here

181

		loadVariable: function(ucrVariable) {

188

		loadVariable: function(ucrVariable) {

182

			this.set('title', _('Edit UCR variable'));

189

			this.set('title', _('Edit UCR variable'));

183

			this._form._widgets.key.set('disabled', true);

190

			this._form._widgets.key.set('disabled', true);

191

			this._form._widgets.default.set('visible', true);

184

192

185

			this.standby(true);

193

			this.standby(true);

186

			this.show();

194

			this.show();

187

Return to bug 38938