Fix recognition of versioned msp package directories

[builder.git] / source / packagemanager.cpp

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index 4d4228279d62e6b8de5c8571b02dfb69bd60d1b1..19b15a45e37de888a72e0a90057d862eaf19392a 100644 (file)
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -20,10 +20,7 @@ PackageManager::PackageManager(Builder &b):
        builder(b),
        no_externals(false),
        env_set(false)
-{
-       pkg_path.push_back(builder.get_work_directory()/".");
-       pkg_path.push_back(builder.get_work_directory()/"..");
-}
+{ }
 
 PackageManager::~PackageManager()
 {
@@ -31,6 +28,11 @@ PackageManager::~PackageManager()
                delete i->second;
 }
 
+void PackageManager::append_package_path(const FS::Path &p)
+{
+       pkg_path.push_back(p);
+}
+
 void PackageManager::set_no_externals(bool x)
 {
        no_externals = x;
@@ -169,7 +171,7 @@ FS::Path PackageManager::get_package_location(const string &name)
 
                if(!base.compare(0, dash, name))
                        return *i;
-               else if(msp && !base.compare(0, dash-3, name, 3, string::npos))
+               else if(msp && !base.compare(0, dash, name, 3, string::npos))
                        return *i;
        }