Modified get_depends handling slightly

2 files changed, 7 insertions, 4 deletions

diff --git a/main/models.py b/main/models.py
index ef8f6cd1..333becca 100644
--- a/main/models.py
+++ b/main/models.py
@@ -235,11 +235,11 @@ class Package(models.Model):
             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))
+                deps.append({'dep': dep, 'pkg': None})
                 continue
             else:
-                for p in pkgs:
-                    deps.append((p.id,dep.depname,dep.depvcmp))
+                for pkg in pkgs:
+                    deps.append({'dep': dep, 'pkg': pkg})
         return deps
 
 class PackageFile(models.Model):
diff --git a/main/tests.py b/main/tests.py
index 7b870c92..d0e87729 100644
--- a/main/tests.py
+++ b/main/tests.py
@@ -21,7 +21,10 @@ class ModelTest(TestCase):
         Test the Package object's get_depends() method
         """
         p = Package.objects.get(pkgname='abs',arch__name__iexact='i686')
-        expected = [(7L, 'bash', ''), (None, 'rsync', None)]
+        dep1 = {'dep': PackageDepend.objects.get(id=1),
+                'pkg': Package.objects.get(id=7)}
+        dep2 = {'dep': PackageDepend.objects.get(id=2), 'pkg': None}
+        expected = [dep1, dep2]
         results = p.get_depends()
         self.failUnlessEqual(results, expected)
         del p