X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackagemanager.cpp;h=5cc768a648c6d607507342cf977b2879191bd416;hb=a116ad9af4a6a75093f6e1c3603d16b397833154;hp=68189205abb8022ba1f272c0a066e4b1a210fa1f;hpb=519f2006e8b33e9b14fdc985766ab4e4e869544b;p=builder.git diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp index 6818920..5cc768a 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)