From: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Date: Thu, 6 Oct 2011 00:17:47 +0000 (+1000)
Subject: Check for a non-error, non-continue case.
X-Git-Tag: qt-v5.0.0-alpha1~238
X-Git-Url: http://git.qt-users.jp/git/?p=mirror%2Fqt%2Fqt5.git;a=commitdiff_plain;h=6bd52260c811d7ad9eb74bde0db02f178bd40b47

Check for a non-error, non-continue case.

There is at least one case in configure where it exist with a code of 0
but does not create .qmake.cache. Detect this and avoid continuing.

Change-Id: I0554991e5d4a50b7072494c080fa2c593e03b726
Reviewed-on: http://codereview.qt-project.org/6094
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---

diff --git a/configure b/configure
index 0c3a268..40152ad 100755
--- a/configure
+++ b/configure
@@ -51,8 +51,18 @@ if (! -e "$relpath/qtbase/configure") {
 
 ensureDir("$outpath/qtbase");
 chdir("$outpath/qtbase");
+if (-e ".qmake.cache") {
+    # Remove this so we can detect if configure finished properly
+    unlink ".qmake.cache";
+}
 my $ret = system_v("$relpath/qtbase/configure @ARGV");
 exit $ret unless ($ret == 0);
+if (! -e ".qmake.cache") {
+    # Even though there was no error code, this file wasn't created
+    # so configure didn't finish properly. This is probaby because
+    # the user passed -help
+    exit 0;
+}
 
 chdir("$outpath");