Store lookup failures separately from the package map

[builder.git] / source / packagemanager.cpp

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index 1a481fb17925a86bf03a6a47b0871fa39ca6e953..240bf60caafd888ad9b56845331235c8849dce62 100644 (file)
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -59,9 +59,10 @@ void PackageManager::add_package(Package *pkg)
 
 Package *PackageManager::find_package(const string &name)
 {
-       PackageMap::iterator i = packages.find(format("%s/%s", name, builder.get_current_arch().get_system()));
-       if(i==packages.end())
-               i = packages.find(name);
+       if(not_found.count(name))
+               return 0;
+
+       PackageMap::iterator i = packages.find(name);
        if(i!=packages.end())
                return i->second;
 
@@ -86,22 +87,21 @@ Package *PackageManager::find_package(const string &name)
                        return i->second;
        }
 
-       Package *pkg = 0;
        try
        {
                // Package source not found - create a binary package
                string flags_str = run_pkgconfig(name, "flags");
                vector<string> flags = split(flags_str);
-               pkg = BinaryPackage::from_flags(builder, name, flags);
+               Package *pkg = BinaryPackage::from_flags(builder, name, flags);
+               packages.insert(PackageMap::value_type(name, pkg));
+               return pkg;
        }
        catch(...)
        {
                builder.problem(name, "not found");
+               not_found.insert(name);
+               return 0;
        }
-
-       packages.insert(PackageMap::value_type(name, pkg));
-
-       return pkg;
 }
 
 string PackageManager::run_pkgconfig(const string &pkg, const string &what)