X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=daklib%2Fqueue_install.py;h=8f05e7bf2ce6e8de7e1627e4db87bb972a7b0173;hb=47cd096281f1cc36dfe9818ef1fbae8d02f6ada6;hp=8d890d20ec528281e7161ad0c71d29d4787af87c;hpb=81816f8c1be86651dd5200440ab09caccf1460b2;p=dak.git

diff --git a/daklib/queue_install.py b/daklib/queue_install.py
old mode 100755
new mode 100644
index 8d890d20..8f05e7bf
--- a/daklib/queue_install.py
+++ b/daklib/queue_install.py
@@ -92,7 +92,7 @@ def is_unembargo(u):
 
    # If we dont have the disembargo queue we are not on security and so not interested
    # in doing any security queue handling
-   disembargo_queue = get_policy_queue("disembargo")
+   disembargo_queue = get_policy_queue("unembargoed")
    if not disembargo_queue:
        return False
 
@@ -128,7 +128,7 @@ def is_unembargo(u):
    return ret
 
 def do_unembargo(u, summary, short_summary, chg, session=None):
-    polq=get_policy_queue('disembargo')
+    polq=get_policy_queue('unembargoed')
     package_to_queue(u, summary, short_summary,
                      polq, chg, session,
                      announce=None)
@@ -140,7 +140,7 @@ def is_embargo(u):
    # last in line, so if that exists, return true
    # Of course do not return true when we accept from out of newstage, as that means
    # it just left embargo and we want it in the archive
-   if get_policy_queue('embargo'):
+   if get_policy_queue('embargoed'):
        session = DBConn().session()
        dbc = get_dbchange(u.pkg.changes_file, session)
        if dbc and dbc.in_queue.queue_name in [ 'newstage' ]:
@@ -149,7 +149,7 @@ def is_embargo(u):
        return True
 
 def do_embargo(u, summary, short_summary, chg, session=None):
-    polq=get_policy_queue('embargo')
+    polq=get_policy_queue('embargoed')
     package_to_queue(u, summary, short_summary,
                      polq, chg, session,
                      announce=None)
@@ -178,7 +178,7 @@ def is_autobyhand(u):
                 all_auto = 0
                 continue
 
-            ABH = cnf.SubTree("AutomaticByHandPackages")
+            ABH = cnf.subtree("AutomaticByHandPackages")
             if not ABH.has_key(pckg) or \
               ABH["%s::Source" % (pckg)] != u.pkg.changes["source"]:
                 print "not match %s %s" % (pckg, u.pkg.changes["source"])