Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

packagefs: fix dependency resolution without compat version

Browse Source
This commit is contained in:
Ingo Weinhold 2013-08-13 07:15:05 +02:00
parent 3ea37257df
commit 7ff288ed51
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/add-ons/kernel/file_systems/packagefs/resolvables/ResolvableFamily.cpp
View File

@ -54,9 +54,12 @@ ResolvableFamily::ResolveDependency(Dependency* dependency)
{
for (FamilyResolvableList::Iterator it = fResolvables.GetIterator();
Resolvable* resolvable = it.Next();) {
if (dependency->ResolvableVersionMatches(resolvable->Version())
&& dependency->ResolvableCompatibleVersionMatches(
resolvable->CompatibleVersion())) {
if (!dependency->ResolvableVersionMatches(resolvable->Version()))
continue;
Version* compatibleVersion = resolvable->CompatibleVersion() != NULL
? resolvable->CompatibleVersion() : resolvable->Version();
if (dependency->ResolvableCompatibleVersionMatches(compatibleVersion)) {
resolvable->AddDependency(dependency);
return true;
}