From 1113462edcf69b81e93a9545198c1091e3bf6703 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 27 Mar 2010 16:58:02 -0500 Subject: Simplify code now that pkgbase is always defined This allows some of our queries to get a lot simpler as well as removing the pkgbase_safe property added earlier. Signed-off-by: Dan McGee --- main/models.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'main') diff --git a/main/models.py b/main/models.py index 309d6b6..5ec38ce 100644 --- a/main/models.py +++ b/main/models.py @@ -203,16 +203,10 @@ class Package(models.Model): return '/packages/%s/%s/%s/' % (self.repo.name.lower(), self.arch.name, self.pkgname) - @property - def pkgbase_safe(self): - if self.pkgbase: - return self.pkgbase - return self.pkgname - @property def maintainers(self): return User.objects.filter( - package_relations__pkgbase=self.pkgbase_safe, + package_relations__pkgbase=self.pkgbase, package_relations__type=PackageRelation.MAINTAINER) @property @@ -283,7 +277,7 @@ class Package(models.Model): root = 'community' else: root = 'packages' - return linkbase % (root, self.pkgbase_safe, svnpath) + return linkbase % (root, self.pkgbase, svnpath) def get_arch_svn_link(self): repo = self.repo.name.lower() -- cgit v1.2.3-24-g4f1b