Attachment 5680 Details for Bug 33582

[patch] ucs_register.patch

ucs_register.patch (text/plain), 1.89 KB, created by Arvid Requate on 2013-11-28 11:21 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2013-11-28 11:21 CET

Size: 1.89 KB

patch

obsolete

>Index: univention-lib/python/ldap_extension.py
>===================================================================
>--- univention-lib/python/ldap_extension.py	(Revision 45777)
>+++ univention-lib/python/ldap_extension.py	(Arbeitskopie)
>@@ -211,8 +211,8 @@
> 			if registered_package == options.packagename:
> 				rc = apt.apt_pkg.version_compare(options.packageversion, registered_package_version)
> 				if not rc > -1:
>-					print >>sys.stderr, "ERROR: Registered package version %s is newer, refusing registration." % (registered_package_version,)
>-					sys.exit(1)
>+					print >>sys.stderr, "WARNING: Registered package version %s is newer, refusing registration." % (registered_package_version,)
>+					sys.exit(2)
> 			else:
> 				print >>sys.stderr, "WARNING: Object %s was registered by package %s version %s, changing ownership." % (self.objectname, registered_package, registered_package_version,)
> 
>Index: univention-lib/shell/ldap.sh
>===================================================================
>--- univention-lib/shell/ldap.sh	(Revision 45777)
>+++ univention-lib/shell/ldap.sh	(Arbeitskopie)
>@@ -327,6 +327,12 @@
> 	PYTHONPATH="/usr/lib/pymodules/$(pyversions -d)/univention/lib" \
> 		python -c 'import ldap_extension; ldap_extension.ucs_registerLDAPExtension()' \
> 			--packagename "$package_name" --packageversion "$package_version" "$@"
>+	rc="$?"
>+	if [ "$rc" = 2 ]; then
>+		echo "WARNING: ucs_registerLDAPExtension returned $rc, continuing anyway."
>+		rc=0
>+	fi
>+	return "$rc"
> }
> 
> # ucs_unregisterLDAPExtension removes an LDAP schema or ACL extension from UDM.
>@@ -338,6 +344,12 @@
> ucs_unregisterLDAPExtension () {
> 	PYTHONPATH="/usr/lib/pymodules/$(pyversions -d)/univention/lib" \
> 		python -c 'import ldap_extension; ldap_extension.ucs_unregisterLDAPExtension()' "$@"
>+	rc="$?"
>+	if [ "$rc" = 2 ]; then
>+		echo "WARNING: ucs_unregisterLDAPExtension returned $rc, continuing anyway."
>+		rc=0
>+	fi
>+	return "$rc"
> }
> 
>

Actions: View | Diff

Attachments on bug 33582: 5680