From: Mark Hymers Date: Fri, 29 Jul 2011 08:41:50 +0000 (+0100) Subject: Remove use of Dir::Queue::Disembargo X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef46daa34127021fef78e185a69c9716b9125cee;p=dak Remove use of Dir::Queue::Disembargo Signed-off-by: Mark Hymers --- diff --git a/daklib/queue_install.py b/daklib/queue_install.py index 8878e55c..8d890d20 100755 --- a/daklib/queue_install.py +++ b/daklib/queue_install.py @@ -89,11 +89,11 @@ def package_to_queue(u, summary, short_summary, queue, chg, session, announce=No def is_unembargo(u): session = DBConn().session() - cnf = Config() # If we dont have the disembargo queue we are not on security and so not interested # in doing any security queue handling - if not get_policy_queue("disembargo"): + disembargo_queue = get_policy_queue("disembargo") + if not disembargo_queue: return False # If we already are in newstage, then it means this just got passed through and accepted @@ -109,10 +109,8 @@ def is_unembargo(u): session.close() return True - oldcwd = os.getcwd() - os.chdir(cnf["Dir::Queue::Disembargo"]) - disdir = os.getcwd() - os.chdir(oldcwd) + # Ensure we don't have a / on the end or something + disdir = os.path.abspath(disembargo_queue.path) ret = False