Merge branch 'master' into dbtests

[dak.git] / daklib / queue_install.py

diff --git a/daklib/queue_install.py b/daklib/queue_install.py
index 1135c137cd1fcb4fec075e4e4aa8eaac029d9aa6..aa58a64b3cc994d209c9d4b47aba62bb9be96f22 100755 (executable)
--- a/daklib/queue_install.py
+++ b/daklib/queue_install.py
@@ -110,7 +110,7 @@ def is_unembargo(u):
 
    if u.pkg.directory == disdir:
        if u.pkg.changes["architecture"].has_key("source"):
-           session.execute("INSERT INTO disembargo (package, version) VALUES (:package, :version)",
+           session.execute("INSERT INTO disembargo (package, version) VALUES (:source, :version)",
                            {'source': u.pkg.changes["source"],
                             'version': u.pkg.changes["version"]})
            session.commit()
@@ -130,7 +130,7 @@ def do_unembargo(u, summary, short_summary, chg, session=None):
         suite = get_suite(suite_name, session)
         for q in suite.copy_queues:
             for f in u.pkg.files.keys():
-                copyfile(os.path.join(polq.path, f), q.path)
+                copyfile(os.path.join(polq.path, f), os.path.join(q.path, f))
 #
 #################################################################################
 #
@@ -156,7 +156,7 @@ def do_embargo(u, summary, short_summary, chg, session=None):
         suite = get_suite(suite_name, session)
         for q in suite.copy_queues:
             for f in u.pkg.files.keys():
-                copyfile(os.path.join(polq.path, f), q.path)
+                copyfile(os.path.join(polq.path, f), os.path.join(q.path, f))
 
 ################################################################################