[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=8369445

The following commit has been merged in the master branch:
commit 8369445c6fab7b1de0de02439573b1032238bef7
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Dec 7 19:48:12 2015 +0000

    buildServer: fix for Windows10/cygwin/bash being unable to launch recursively.
---
 jenkins_build.sh | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/jenkins_build.sh b/jenkins_build.sh
index 49db985..b9d40d3 100755
--- a/jenkins_build.sh
+++ b/jenkins_build.sh
@@ -174,18 +174,12 @@ case "$build" in
 			/usr/local/bin/exiv2 -v -V
 			result=$?
         else
-			if [ "$x64" == true ]; then
-				export RECURSIVE=1
-				# /cygdrive/c/cygwin64/bin/bash.exe -c "cd $PWD ; ./$0"
-				cd "$PWD" ; ./$0
-				result=$?
-			fi
-			if [ "$Win32" == true ]; then
-				export RECURSIVE=1
-				# /cygdrive/c/cygwin/bin/bash.exe -c "cd $PWD ; ./$0"
-				cd "$PWD" ; ./$0
-				result=$?
-			fi
+			export RECURSIVE=1
+			# don't recursively invoke bash as this dies on Windows 10.
+			# simply call the script again in the same bash session
+			# /cygdrive/c/cygwin64/bin/bash.exe -c "cd $PWD ; ./$0"
+			./$0
+			result=$?
         fi
   ;;
 

-- 
exiv2 packaging