Return package IDs only in dependency API

This commit is contained in:
rubenwardy 2020-06-05 04:29:52 +01:00
parent ba8c4d3d24
commit c3cef1eed6
2 changed files with 5 additions and 2 deletions

View File

@ -64,11 +64,11 @@ def package_dependencies(package):
if dep.package:
name = dep.package.name
fulfilled_by = [ dep.package.getAsDictionaryKey() ]
fulfilled_by = [ dep.package.getId() ]
elif dep.meta_package:
name = dep.meta_package.name
fulfilled_by = [ pkg.getAsDictionaryKey() for pkg in dep.meta_package.packages]
fulfilled_by = [ pkg.getId() for pkg in dep.meta_package.packages]
else:
raise "Malformed dependency"

View File

@ -465,6 +465,9 @@ class Package(db.Model):
for e in PackagePropertyKey:
setattr(self, e.name, getattr(package, e.name))
def getId(self):
return "{}/{}".format(self.author.username, self.name)
def getIsFOSS(self):
return self.license.is_foss and self.media_license.is_foss