X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackagemanager.cpp;h=240bf60caafd888ad9b56845331235c8849dce62;hb=7c61a1e64153bac91431e1a72d946208dd61eb30;hp=746755eaf2d36b4afac5273fbfc5fc9375c9f183;hpb=241934daad13f83e86983b474dcadb0190e1cf0b;p=builder.git diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp index 746755e..240bf60 100644 --- a/source/packagemanager.cpp +++ b/source/packagemanager.cpp @@ -59,6 +59,9 @@ void PackageManager::add_package(Package *pkg) Package *PackageManager::find_package(const string &name) { + if(not_found.count(name)) + return 0; + PackageMap::iterator i = packages.find(name); if(i!=packages.end()) return i->second; @@ -84,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 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)