Modified get_depends handling slightly

main/models.py

@@ -235,11 +235,11 @@ def get_depends(self):
             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):

main/tests.py

@@ -21,7 +21,10 @@ def testPackageGetDepends(self):
         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

templates/packages/details.html

@@ -55,11 +55,11 @@ <h2 class="title">{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h2>
                     <div class="listing">
                         <h4>Dependencies:</h4>
                         <ul style="font-size:small;list-style:none">
-                        {% for dep in pkg.get_depends %}
-                          {% ifequal dep.0 None %}
-                            <li>{{ dep.1 }}</li>
+                        {% for depend in pkg.get_depends %}
+                          {% ifequal depend.pkg None %}
+                            <li>{{ depend.dep.depname }} (virtual)</li>
                           {% else %}
-                            <li><a href="/packages/{{ dep.0 }}/">{{ dep.1 }}</a>{{ dep.2 }}</li>
+                            <li><a href="/packages/{{ depend.pkg.id }}/">{{ depend.dep.depname }}</a>{{ depend.dep.depvcmp }}</li>
                           {% endifequal %}
                         {% endfor %}
                         </ul>