packagefs: Directories with more attributes take precedence over ones with less.

This still preserves the behavior that system packages take precedence over
non-system packages.

Fixes  (at last.)
This commit is contained in:
Augustin Cavalier 2018-08-05 18:24:02 -04:00
parent abf0c2878a
commit 5301f108ef
2 changed files with 24 additions and 0 deletions
src/add-ons/kernel/file_systems/packagefs/package

View File

@ -5,6 +5,7 @@
#include "PackageDirectory.h"
#include "Package.h"
PackageDirectory::PackageDirectory(Package* package, mode_t mode)
@ -35,3 +36,22 @@ PackageDirectory::RemoveChild(PackageNode* node)
fChildren.Remove(node);
node->ReleaseReference();
}
bool
PackageDirectory::operator<(const PackageDirectory& other) const
{
// If one of us has the SYSTEM_PACKAGE flag and the other doesn't,
// let PackageNode take care of the comparison.
if ((fPackageFlags & BPackageKit::B_PACKAGE_FLAG_SYSTEM_PACKAGE)
!= (other.fPackageFlags
& BPackageKit::B_PACKAGE_FLAG_SYSTEM_PACKAGE)) {
return PackageNode::operator<(other);
}
const int32 attrs = fAttributes.Count(),
otherAttrs = other.fAttributes.Count();
if (attrs != otherAttrs)
return attrs < otherAttrs;
return PackageNode::operator<(other);
}

View File

@ -26,6 +26,10 @@ public:
const PackageNodeList& Children() const
{ return fChildren; }
bool operator<(const PackageDirectory& other) const;
inline bool operator>(const PackageDirectory& other) const
{ return other < *this; }
private:
PackageNodeList fChildren;
};