modify relateSourcePackage to take package/version

...instead of a source package, which should remove an
extra query and also allow changing the behaviour for
findSourcePackage later on as well

1 files changed, 3 insertions, 4 deletions

diff --git a/patchtracker/DB.py b/patchtracker/DB.py
index b72b11e..e706d97 100644
--- a/patchtracker/DB.py
+++ b/patchtracker/DB.py
@@ -129,15 +129,14 @@ class PatchTrackerDB:
     cursor.execute(q, (srcpkg.name, suite))
     return cursor.fetchone()
 
-  def relateSourcePackage(self, srcpkg, suite, component):
-    s = self.findSourcePackage(srcpkg)
+  def relateSourcePackage(self, name, version, suite, component):
     q = "INSERT OR REPLACE INTO package_rel_map \
            (package_id,suite_id,component_id) \
-           VALUES (?, \
+           VALUES (SELECT id FROM packages WHERE name=? AND version=?), \
                   (SELECT id FROM suites WHERE name=?), \
                   (SELECT id FROM components WHERE name=?))"
     cursor = self.db.cursor()
-    cursor.execute(q, (s[0], suite, component))
+    cursor.execute(q, (name, version, suite, component))
 
   def finalize(self):
     self.db.commit()