Attachment 4507 Details for Bug 27836

[patch] Replace univention.lib.shell.escape by pipes.quote

27836_ucr-dep-cycle.diff (text/plain), 6.18 KB, created by Philipp Hahn on 2012-07-05 16:01 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2012-07-05 16:01 CEST

Size: 6.18 KB

patch

obsolete

>diff --git a/branches/ucs-3.0/ucs/base/univention-config-registry/debian/changelog b/branches/ucs-3.0/ucs/base/univention-config-registry/debian/changelog
>index 1d99309..1d3c74c 100644
>--- a/branches/ucs-3.0/ucs/base/univention-config-registry/debian/changelog
>+++ b/branches/ucs-3.0/ucs/base/univention-config-registry/debian/changelog
>@@ -1,3 +1,9 @@
>+univention-config-registry (7.0.33-2) unstable; urgency=low
>+
>+  * Don't use univention-lib because of circular dependency (Bug #27836)
>+
>+ -- Philipp Hahn <hahn@univention.de>  Thu, 05 Jul 2012 15:38:07 +0200
>+
> univention-config-registry (7.0.33-1) unstable; urgency=low
> 
>   * modified format of the install script usage messages (Bug #19853)
>diff --git a/branches/ucs-3.0/ucs/base/univention-config-registry/debian/control b/branches/ucs-3.0/ucs/base/univention-config-registry/debian/control
>index 2f51cab..5f2f71b 100644
>--- a/branches/ucs-3.0/ucs/base/univention-config-registry/debian/control
>+++ b/branches/ucs-3.0/ucs/base/univention-config-registry/debian/control
>@@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 7.0.50~),
>  locales,
>  libtool,
>  libunivention-debug-dev (>= 5.0.6-1),
>- python-univention-lib,
>  python-all
> Standards-Version: 3.5.2
> XS-Python-Version: all
>@@ -86,8 +85,7 @@ Description: UCS - C interface to configuration manager (development files)
> 
> Package: python-univention-config-registry
> Architecture: all
>-Depends: ${misc:Depends}, ${python:Depends},
>- python-univention-lib
>+Depends: ${misc:Depends}, ${python:Depends}
> Provides: ${python:Provides}
> XB-Python-Version: ${python:Versions}
> Description: UCS - Python interface to configuration registry
>diff --git a/branches/ucs-3.0/ucs/base/univention-config-registry/python/univention/config_registry.py b/branches/ucs-3.0/ucs/base/univention-config-registry/python/univention/config_registry.py
>index 8ffdf67..27ccda2 100644
>--- a/branches/ucs-3.0/ucs/base/univention-config-registry/python/univention/config_registry.py
>+++ b/branches/ucs-3.0/ucs/base/univention-config-registry/python/univention/config_registry.py
>@@ -42,10 +42,7 @@ import pwd
> import grp
> import time
> from debhelper import parseRfc822
>-try:
>-	from univention.lib.shell import escape_value
>-except ImportError:
>-	def escape_value(v): sys.exit(1) # FIXME: univention.lib clashed during install
>+from pipes import quote as escape_value
> 
> variable_pattern = re.compile('@%@([^@]+)@%@')
> variable_token = re.compile('@%@')
>@@ -1052,8 +1049,8 @@ def randpw():
> 
> def replog(method, scope, ucr, var, value=None):
> 	"""
>- 	This function writes a new entry to replication logfile if
>-    this feature has been enabled.
>+	This function writes a new entry to replication logfile if
>+	this feature has been enabled.
> 	"""
> 	if ucr.is_true('ucr/replog/enabled',False):
> 		if method == 'set':
>@@ -1091,14 +1088,14 @@ def handler_set( args, opts = {}, quiet = False ):
> 	current_scope = ConfigRegistry.NORMAL
> 	reg = None
> 	if opts.get( 'ldap-policy', False ):
>- 		current_scope = ConfigRegistry.LDAP
>- 		reg = ConfigRegistry( write_registry = current_scope )
>+		current_scope = ConfigRegistry.LDAP
>+		reg = ConfigRegistry( write_registry = current_scope )
> 	elif opts.get( 'force', False ):
>- 		current_scope = ConfigRegistry.FORCED
>- 		reg = ConfigRegistry( write_registry = current_scope)
>+		current_scope = ConfigRegistry.FORCED
>+		reg = ConfigRegistry( write_registry = current_scope)
> 	elif opts.get( 'schedule', False ):
>- 		current_scope = ConfigRegistry.SCHEDULE
>- 		reg = ConfigRegistry( write_registry = current_scope)
>+		current_scope = ConfigRegistry.SCHEDULE
>+		reg = ConfigRegistry( write_registry = current_scope)
> 	else:
> 		reg = ConfigRegistry()
> 
>@@ -1152,17 +1149,17 @@ def handler_unset( args, opts = {} ):
> 	"""
> 	Unset config registry variables in args.
> 	"""
>- 	current_scope = ConfigRegistry.NORMAL
>+	current_scope = ConfigRegistry.NORMAL
> 	reg = None
> 	if opts.get( 'ldap-policy', False ):
>- 		current_scope = ConfigRegistry.LDAP
>- 		reg = ConfigRegistry( write_registry = current_scope )
>+		current_scope = ConfigRegistry.LDAP
>+		reg = ConfigRegistry( write_registry = current_scope )
> 	elif opts.get( 'force', False ):
>- 		current_scope = ConfigRegistry.FORCED
>- 		reg = ConfigRegistry( write_registry = current_scope)
>+		current_scope = ConfigRegistry.FORCED
>+		reg = ConfigRegistry( write_registry = current_scope)
> 	elif opts.get( 'schedule', False ):
>- 		current_scope = ConfigRegistry.SCHEDULE
>- 		reg = ConfigRegistry( write_registry = current_scope)
>+		current_scope = ConfigRegistry.SCHEDULE
>+		reg = ConfigRegistry( write_registry = current_scope)
> 	else:
> 		reg = ConfigRegistry()
> 	reg.lock()
>@@ -1329,24 +1326,24 @@ def handler_search( args, opts = {} ):
> 	all_vars = {}
> 	for key, var in info.get_variables (category).items ():
> 		all_vars [ key ] = ( None, var, None )
>- 	for key, scope_value in b.items( getscope = True ):
>- 		var_triple = all_vars.get ( key )
>- 		if var_triple:
>- 			all_vars [ key ] = ( scope_value[1], var_triple[1], scope_value[0] )
>+	for key, scope_value in b.items( getscope = True ):
>+		var_triple = all_vars.get ( key )
>+		if var_triple:
>+			all_vars [ key ] = ( scope_value[1], var_triple[1], scope_value[0] )
> 		elif not category:
>- 			all_vars [ key ] = ( scope_value[1], None, scope_value[0] )
>+			all_vars [ key ] = ( scope_value[1], None, scope_value[0] )
> 
>- 	for key, var_triple in all_vars.items():
>+	for key, var_triple in all_vars.items():
> 		for reg in regex:
> 			if \
> 				( search_keys and reg.search ( key ) ) or \
>- 				( search_values and var_triple[0] and reg.search ( var_triple[0] ) ) or \
>+				( search_values and var_triple[0] and reg.search ( var_triple[0] ) ) or \
> 				( search_all and ( \
> 				  ( reg.search ( key ) ) or \
>- 				  ( var_triple[0] and reg.search ( var_triple[0] ) ) or \
>- 				  ( var_triple[1] and reg.search ( var_triple[1].get ( 'description', '' ) ) ) ) \
>+				  ( var_triple[0] and reg.search ( var_triple[0] ) ) or \
>+				  ( var_triple[1] and reg.search ( var_triple[1].get ( 'description', '' ) ) ) ) \
> 				):
>- 				print_variable_info_string ( key, var_triple[0], var_triple[1], var_triple[2], show_scope, brief, non_empty, verbose )
>+				print_variable_info_string ( key, var_triple[0], var_triple[1], var_triple[2], show_scope, brief, non_empty, verbose )
> 				break
> 
> def handler_get( args, opts = {} ):

Actions: View | Diff

Attachments on bug 27836: 4505 | 4507