From 54c30baf0be93d601930cc4f6112327efdf66b7d Mon Sep 17 00:00:00 2001 From: eliott Date: Wed, 16 Apr 2008 21:16:30 -0700 Subject: fixed issue where testing and unstable packages caused errors in get_depends --- main/models.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/main/models.py b/main/models.py index 1e7d0647..3d732154 100644 --- a/main/models.py +++ b/main/models.py @@ -222,17 +222,18 @@ class Package(models.Model): """ deps = [] for dep in self.packagedepend_set.order_by('depname'): - try: - # we only need depend on same-arch-packages - p = Package.objects.get( - Q(arch__name__iexact='any') | Q(arch=self.arch), - pkgname=dep.depname) - except Package.DoesNotExist, IndexError: + # we only need depend on same-arch-packages + pkgs = Package.objects.filter( + Q(arch__name__iexact='any') | Q(arch=self.arch), + pkgname=dep.depname) + if len(pkgs) == 0: # couldn't find a package in the DB # it should be a virtual depend (or a removed package) deps.append((None, dep.depname, None)) continue - deps.append((p.id,dep.depname,dep.depvcmp)) + else: + for p in pkgs: + deps.append((p.id,dep.depname,dep.depvcmp)) return deps class PackageFile(models.Model): -- cgit v1.1-4-g5e80