X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=1de726bcb2b3393f267e363741525da20d6c72e6;hb=cbb3c4c6aab7b04f7bd2178fb8f12846d532a472;hp=cb8ddf610fe7b0237fb5a9f078ebcd122144e3ee;hpb=0d80cabf649b931b26e7055385156c75a7385d35;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index cb8ddf6..1de726b 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -233,15 +233,6 @@ int Builder::main()
 
 	default_pkg->create_build_info();
 
-	/*cout<<"Active packages:";
-	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
-	{
-		cout<<' '<<i->second->get_name();
-		if(i->second->get_buildable())
-			cout<<'*';
-	}
-	cout<<'\n';*/
-	
 	if(create_targets())
 		return 1;
 
@@ -261,8 +252,6 @@ int Builder::main()
 		}
 	}
 
-	//cout<<"Active targets: "<<targets.size()<<'\n';
-
 	if(analyzer)
 		analyzer->analyze();
 
@@ -465,7 +454,7 @@ int Builder::build()
 
 	while(!finish)
 	{
-		if(actions.size()<jobs && !finish)
+		if(actions.size()<jobs && !fail)
 		{
 			Target *tgt=cmdline->get_buildable_target();
 			if(tgt)
@@ -506,7 +495,9 @@ int Builder::build()
 				delete actions[i];
 				actions.erase(actions.begin()+i);
 				if(status>0)
-					finish=fail=true;
+					fail=true;
+				if(actions.empty() && fail)
+					finish=true;
 			}
 			else
 				++i;