[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    icecream/client
From:       Stephan Kulow <coolo () kde ! org>
Date:       2006-09-04 8:41:53
Message-ID: 1157359313.647617.26014.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 580682 by coolo:

if ICECC=no is set, then don't try to talk to the local daemon
at all avoiding all kind of problems. If your icecream is hosed,
you want a quick way out :)


 M  +6 -5      main.cpp  


--- trunk/icecream/client/main.cpp #580681:580682
@@ -215,17 +215,18 @@
 
     CompileJob job;
 
+    local |= analyse_argv( argv, job );
+
     /* if ICECC is set to no, then run job locally */
     if ( getenv( "ICECC" ) ) {
 	string icecc;
 	icecc = getenv( "ICECC" );
-        if ( icecc == "no" ) {
-	    local = true;
-        }
+        /* if the environment variable is set, the user wants to debug if a compile
+           failure is to blame to icecream, so make sure we do the least we can. */
+        if ( icecc == "no" )
+            return build_local( job, 0 );
     }
 
-    local |= analyse_argv( argv, job );
-
     MsgChannel *local_daemon = Service::createChannel( "127.0.0.1", 10245, 0/*timeout*/);
     if ( ! local_daemon ) {
         log_warning() << "no local daemon found\n";
[prev in list] [next in list] [prev in thread] [next in thread]