From 9f3b151dabd9cfeefd40c89c79c9e57ca5354bae Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 4 Mar 2016 22:29:28 +0100
Subject: [PATCH] [ticket/14492] Checkout master if viglink tag does not exist
 for latest version

PHPBB3-14492
---
 build/build.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index ab7085eda6..69ecaa896c 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -142,6 +142,7 @@
 
 		<phingcall target="export">
 			<property name="revision" value="release-${version}" />
+			<property name="version" value="${version}" />
 			<property name="dir" value="build/old_versions/release-${version}" />
 			<property name="skip-composer" value="true" />
 		</phingcall>
@@ -308,7 +309,18 @@
 				<if>
 					<equals arg1="${revision}" arg2="HEAD" trim="true" />
 					<then>
-						<exec dir="${dir}/ext/phpbb/viglink" command="git checkout master" passthru="true" />
+						<exec dir="${dir}/ext/phpbb/viglink"
+							command="git rev-parse release-phpbb-${version}"
+							returnProperty='viglink_head_tag_exists' />
+						<if>
+							<equals arg1="${viglink_head_tag_exists}" arg2="0" trim="true" />
+							<then>
+								<exec dir="${dir}/ext/phpbb/viglink" command="git checkout release-phpbb-${version}" passthru="true" />
+							</then>
+							<else>
+								<exec dir="${dir}/ext/phpbb/viglink" command="git checkout master" passthru="true" />
+							</else>
+						</if>
 					</then>
 					<else>
 						<exec dir="${dir}/ext/phpbb/viglink" command="git checkout release-phpbb-${version}" passthru="true" />