Attachment 7401 Details for Bug 40417 – univention-updater-r64829.patch

[patch] univention-updater-r64829.patch

univention-updater-r64829.patch (text/plain), 2.21 KB, created by Arvid Requate on 2016-01-12 13:27:28 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2016-01-12 13:27:28 CET

Size: 2.21 KB

patch

obsolete

>Index: debian/changelog
>===================================================================
>--- debian/changelog	(Revision 64828)
>+++ debian/changelog	(Revision 64829)
>@@ -1,3 +1,10 @@
>+univention-updater (11.0.4-1) unstable; urgency=medium
>+
>+  * scripts/preup.sh: Check DC Master UCS version and abort if the DC
>+    master version is lower or equal (Bug #37260)
>+
>+ -- Stefan Gohmann <gohmann@univention.de>  Sat, 24 Oct 2015 20:55:26 +0200
>+
> univention-updater (11.0.3-6) unstable; urgency=medium
> 
>   * Bug #39082: Re-Revert, now with pep8 support
>Index: script/preup.sh
>===================================================================
>--- script/preup.sh	(Revision 64828)
>+++ script/preup.sh	(Revision 64829)
>@@ -317,6 +317,38 @@
> 	fi
> fi
> 
>+# check for DC Master UCS version
>+check_master_version ()
>+{
>+	if [ -f /var/univention-join/joined ]; then
>+		if [ "$server_role" != domaincontroller_master -a "$server_role" != basesystem ]; then
>+			master_version="$(univention-ssh /etc/machine.secret ${hostname}\$@$ldap_master /usr/sbin/ucr get version/version 2>/dev/null)" >&3 2>&3
>+			master_patchlevel="$(univention-ssh /etc/machine.secret ${hostname}\$@$ldap_master /usr/sbin/ucr get version/patchlevel 2>/dev/null)" >&3 2>&3
>+			python -c 'from univention.lib.ucs import UCS_Version
>+import sys
>+master=UCS_Version("'$master_version'-'$master_patchlevel'")
>+me=UCS_Version("'$version_version'-'$version_patchlevel'")
>+if master <= me:
>+	sys.exit(1)
>+'
>+			if [ $? != 0 ]; then
>+				echo "WARNING: Your domain controller master is still on version $master_version-$master_patchlevel."
>+				echo "         It is strongly recommended that the domain controller master is"
>+				echo "         always the first system to be updated during a release update."
>+				
>+				if is_ucr_true update41/ignore_version; then
>+					echo "WARNING: update41/ignore_version is set to true. Skipped as requested."
>+				else
>+					echo "This check can be skipped by setting the UCR"
>+					echo "variable update41/ignore_version to yes."
>+					exit 1
>+				fi
>+			fi
>+		fi
>+	fi
>+}
>+check_master_version
>+
> # autoremove before the update
> if ! is_ucr_true update41/skip/autoremove; then
>     DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes autoremove >>"$UPDATER_LOG" 2>&1

Actions: View | Diff

Attachments on bug 40417: 7401