X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildercli.cpp;h=a7dd1e23ff2402f94ab07a1b67ce85f0fb446801;hb=6e02286dcbd62b8f5ef56987c2298d54b689ad9c;hp=35eba9c03512fe9024c68aad1fe5e986cb9357de;hpb=28bc25948ff58612600ce29a6a0b2cf58548dff9;p=builder.git

diff --git a/source/buildercli.cpp b/source/buildercli.cpp
index 35eba9c..a7dd1e2 100644
--- a/source/buildercli.cpp
+++ b/source/buildercli.cpp
@@ -121,14 +121,16 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
 	else if(!clean && !create_makefile)
 		build = true;
 
-	const vector<string> &args = getopt.get_args();
-	for(vector<string>::const_iterator i=args.begin(); i!=args.end(); ++i)
+	for(NameList::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); )
 	{
 		string::size_type equal = i->find('=');
 		if(equal!=string::npos)
+		{
 			cmdline_options.insert(Config::InputOptions::value_type(i->substr(0, equal), i->substr(equal+1)));
+			cmdline_targets.erase(i++);
+		}
 		else
-			cmdline_targets.push_back(*i);
+			++i;
 	}
 
 	if(!work_dir.empty())
@@ -253,12 +255,12 @@ int BuilderCLI::main()
 	if(analyzer)
 		analyzer->analyze();
 
-	const Builder::ProblemList &problems = builder.get_problems();
-	if(!problems.empty())
+	if(build_graph.get_goals().is_broken())
 	{
+		list<string> problems = builder.collect_problems();
 		IO::print(IO::cerr, "The following problems were detected:\n");
-		for(Builder::ProblemList::const_iterator i=problems.begin(); i!=problems.end(); ++i)
-			IO::print(IO::cerr, "  %s: %s\n", i->package, i->descr);
+		for(list<string>::const_iterator i=problems.begin(); i!=problems.end(); ++i)
+			IO::print(IO::cerr, "  %s\n", *i);
 		if(!analyzer)
 			IO::print(IO::cerr, "Please fix them and try again.\n");
 		return 1;
@@ -313,11 +315,7 @@ bool BuilderCLI::prepare_build()
 		build_graph.force_full_rebuild();
 
 	if(!dry_run)
-	{
-		const PackageManager::PackageMap &packages = package_manager.get_packages();
-		for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
-			i->second->save_caches();
-	}
+		package_manager.save_all_caches();
 
 	return true;
 }