Merge commit 'ftpmaster/master' into sqlalchemy

[dak.git] / dak / make_pkg_file_mapping.py

diff --git a/dak/make_pkg_file_mapping.py b/dak/make_pkg_file_mapping.py
index 60c39d3ec68dcb25a577a63feb6e944c60ebdd8a..38a6bec2aeb65eba5edbfb113181f68195b2cc73 100755 (executable)
--- a/dak/make_pkg_file_mapping.py
+++ b/dak/make_pkg_file_mapping.py
@@ -32,14 +32,9 @@ and binary package version it has in a standard rfc2822-like format.
 ################################################################################
 
 import os
-import pg
 import sys
-from daklib import database
-from daklib import utils
 
-################################################################################
-
-projectB = None #: database connection, pgobject
+from daklib.dbconn import *
 
 ################################################################################
 
@@ -74,14 +69,16 @@ def build_mapping():
     ORDER BY source, version, package, bin_version
     """
 
-    for row in projectB.query(query_sources).getresult():
+    session = DBConn().session()
+
+    for row in session.execute(query_sources).fetchall():
         (source, version, path) = row
         print "Path: %s"%path
         print "Source: %s"%source
         print "Source-Version: %s"%version
         print
 
-    for row in projectB.query(query_binaries).getresult():
+    for row in session.execute(query_binaries).fetchall():
         (source, version, arch, path, bin, binv) = row
         print "Path: %s"%path
         print "Source: %s"%source
@@ -94,10 +91,7 @@ def build_mapping():
 ################################################################################
 
 def main():
-    global projectB
-
-    Cnf = utils.get_conf()
-    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
+    DBConn()
     build_mapping()
 
 #########################################################################################