From d6100a52216fd8a06643d4d5003ab016221e8ba6 Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Sun, 23 Mar 2008 20:46:10 +0000
Subject: Fix configure -svnupdate not bailing if conflicts occur.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9177 e03df62e-2008-0410-955e-edbf42e46eb7
---
 configure | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure b/configure
index 21e283ef8..781b098a6 100755
--- a/configure
+++ b/configure
@@ -560,6 +560,8 @@ sub svnupdate
 	{
 		print STDERR "\e[0;33;1mERROR:\e[0m You have local modifications which conflicted with the updates from SVN\n";
 		printf STDERR "Configure is not able to complete the update. Please resolve these conflicts, then run ./configure -%supdate", (($coredirchanged || $configurechanged) ? "" : "mod");
+		print "Conflicted files: " . join ", ", @conflicted;
+		exit 1;
 	}
 	if ($configurechanged || $coredirchanged)
 	{
-- 
cgit v1.2.3