Remove the include path for used local components

[builder.git] / source / lib / package.cpp

diff --git a/source/lib/package.cpp b/source/lib/package.cpp
index 10c2db01d307c47a357b790ef3dd73cda87c980e..0c3adc5eb1137756f5f7c455ea99b49d37776d85 100644 (file)
--- a/source/lib/package.cpp
+++ b/source/lib/package.cpp
@@ -18,11 +18,16 @@ void Package::prepare()
        if(prepared)
                return;
 
-       for(Package *r: requires)
+       prepared = true;
+
+       for(Package *r: required_pkgs)
+       {
                r->prepare();
+               broken |= r->is_broken();
+       }
 
        do_prepare();
-       prepared = true;
+       broken |= !problems.empty();
 }
 
 
@@ -38,7 +43,7 @@ void Package::Loader::require(const string &n)
 {
        Package *req = obj.builder.get_package_manager().find_package(n);
        if(req)
-               obj.requires.push_back(req);
+               obj.required_pkgs.push_back(req);
        else
                obj.problems.push_back(format("Required package %s not found", n));
 }