This ugly hack for arch-specific binary packages is no longer needed

[builder.git] / source / packagemanager.cpp

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index 7f186382a3e76cf4b8a490095ec9c91f1e416ba4..746755eaf2d36b4afac5273fbfc5fc9375c9f183 100644 (file)
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -59,9 +59,7 @@ 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);
+       PackageMap::iterator i = packages.find(name);
        if(i!=packages.end())
                return i->second;
 
@@ -163,7 +161,7 @@ FS::Path PackageManager::get_package_location(const string &name)
 
        if(pkg_dirs.empty())
        {
-               for(list<FS::Path>::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i)
+               for(SearchPath::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);
@@ -185,9 +183,9 @@ FS::Path PackageManager::get_package_location(const string &name)
        }
 
        bool msp = !name.compare(0, 3, "msp");
-       for(list<FS::Path>::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i)
+       for(SearchPath::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i)
        {
-               string base = basename(*i);
+               string base = FS::basename(*i);
                unsigned dash = base.rfind('-');
 
                if(!base.compare(0, dash, name))