]> git.tdb.fi Git - builder.git/commitdiff
Always accept an exact match for a source package directory name
authorMikko Rasa <tdb@tdb.fi>
Sat, 9 Sep 2023 17:42:32 +0000 (20:42 +0300)
committerMikko Rasa <tdb@tdb.fi>
Sat, 9 Sep 2023 17:42:32 +0000 (20:42 +0300)
This allows packages to be found even if the dependency name contains a
version in it.

source/lib/packagemanager.cpp

index 6763aa78ef463556583eb540b514db52966ba863..6b4174f91ddb60ff93c5ecdadbd2e150a403c464 100644 (file)
@@ -214,8 +214,10 @@ FS::Path PackageManager::get_package_location(const string &name)
        for(const FS::Path &p: pkg_dirs)
        {
                string base = FS::basename(p);
-               unsigned dash = base.rfind('-');
+               if(base==name)
+                       return p;
 
+               unsigned dash = base.rfind('-');
                if(!base.compare(0, dash, name))
                        return p;
                else if(msp && !base.compare(0, dash, name, 3, string::npos))