Attachment 7404 Details for Bug 40300 – sync_msprinterpolicy_from_ucs.patch

[patch] sync_msprinterpolicy_from_ucs.patch

sync_msprinterpolicy_from_ucs.patch (text/plain), 2.28 KB, created by Arvid Requate on 2016-01-12 21:08:13 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2016-01-12 21:08:13 CET

Size: 2.28 KB

patch

obsolete

>Index: debian/ucs-school-nonedu-slave.postinst
>===================================================================
>--- debian/ucs-school-nonedu-slave.postinst	(Revision 66746)
>+++ debian/ucs-school-nonedu-slave.postinst	(Arbeitskopie)
>@@ -81,10 +81,14 @@
> 			if [ -e /var/univention-join/joined ] && is_ucr_true connector/s4/autostart; then
> 				if [ -x /etc/init.d/univention-s4-connector ]; then
> 					invoke-rc.d univention-s4-connector crestart
>-					if [ -x /usr/share/univention-s4-connector/resync_object_from_s4.py ]; then
>-						/usr/share/univention-s4-connector/resync_object_from_s4.py --filter '(objectClass=msPrint-ConnectionPolicy)'
>-					fi
> 				fi
>+				# First sync from UCS to S4 to avoid surprises for already upgraded Slave PDCs
>+				if [ -x /usr/share/univention-s4-connector/resync_object_from_ucs.py ]; then
>+					/usr/share/univention-s4-connector/resync_object_from_ucs.py --filter '(objectClass=msPrintConnectionPolicy)'
>+				fi
>+				if [ -x /usr/share/univention-s4-connector/resync_object_from_s4.py ]; then
>+					/usr/share/univention-s4-connector/resync_object_from_s4.py --filter '(objectClass=msPrint-ConnectionPolicy)'
>+				fi
> 			fi
> 		fi
> 	fi
>Index: debian/ucs-school-slave.postinst
>===================================================================
>--- debian/ucs-school-slave.postinst	(Revision 66746)
>+++ debian/ucs-school-slave.postinst	(Arbeitskopie)
>@@ -129,10 +129,14 @@
> 			if [ -e /var/univention-join/joined ] && is_ucr_true connector/s4/autostart; then
> 				if [ -x /etc/init.d/univention-s4-connector ]; then
> 					invoke-rc.d univention-s4-connector crestart
>-					if [ -x /usr/share/univention-s4-connector/resync_object_from_s4.py ]; then
>-						/usr/share/univention-s4-connector/resync_object_from_s4.py --filter '(objectClass=msPrint-ConnectionPolicy)'
>-					fi
> 				fi
>+				# First sync from UCS to S4 to avoid surprises for already upgraded Slave PDCs
>+				if [ -x /usr/share/univention-s4-connector/resync_object_from_ucs.py ]; then
>+					/usr/share/univention-s4-connector/resync_object_from_ucs.py --filter '(objectClass=msPrintConnectionPolicy)'
>+				fi
>+				if [ -x /usr/share/univention-s4-connector/resync_object_from_s4.py ]; then
>+					/usr/share/univention-s4-connector/resync_object_from_s4.py --filter '(objectClass=msPrint-ConnectionPolicy)'
>+				fi
> 			fi
> 		fi
> 	fi

Actions: View | Diff

Attachments on bug 40300: 7404