X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackagemanager.cpp;h=01c9e09c1959de54b6408fcd71e46cbce173c7fa;hb=f7e0a54c49480981a8d9bec064375323fce0aaf1;hp=68189205abb8022ba1f272c0a066e4b1a210fa1f;hpb=519f2006e8b33e9b14fdc985766ab4e4e869544b;p=builder.git

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index 6818920..01c9e09 100644
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -102,17 +102,7 @@ string PackageManager::run_pkgconfig(const string &pkg, const string &what)
 
 	builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
 
-	ExternalTask task(argv);
-	task.set_stdout(ExternalTask::CAPTURE);
-	task.set_stderr(ExternalTask::IGNORE);
-	task.start();
-	Task::Status status;
-	while((status=task.check())==Task::RUNNING)
-		Time::sleep(10*Time::msec);
-	if(status==Task::ERROR)
-		throw runtime_error(format("pkg-config for package %s failed", pkg));
-
-	return task.get_output();
+	return ExternalTask::run_and_capture_output(argv);
 }
 
 FS::Path PackageManager::get_package_location(const string &name)
@@ -133,6 +123,7 @@ FS::Path PackageManager::get_package_location(const string &name)
 	{
 		for(list<FS::Path>::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i)
 		{
+			builder.get_logger().log("files", format("Traversing %s", *i));
 			list<string> files = list_files(*i);
 			for(list<string>::const_iterator j=files.begin(); j!=files.end(); ++j)
 			{