is_unembargo is run after we've cd'ed into holding

diff --git a/db_access.py b/db_access.py
index 45ce1c1f3b377ac4a0a163831ea0409ff59686a8..cdc113f7996ee60e4cd68b762a12c1e8e0a3c281 100644 (file)
--- a/db_access.py
+++ b/db_access.py
@@ -2,7 +2,7 @@
 
 # DB access fucntions
 # Copyright (C) 2000, 2001, 2002, 2003, 2004  James Troup <james@nocrew.org>
-# $Id: db_access.py,v 1.17 2005-12-05 03:45:12 ajt Exp $
+# $Id: db_access.py,v 1.18 2005-12-05 05:08:10 ajt Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -304,6 +304,7 @@ def get_files_id (filename, size, md5sum, location_id):
 
 def get_or_set_queue_id (queue):
     global queue_id_cache
+
     if queue_id_cache.has_key(queue):
         return queue_id_cache[queue]
 

diff --git a/jennifer b/jennifer
index 715440433e0fc2c44e48af09d5ce3925faa77493..08cc5533f81fc90e859f11d536be6e7218baf51b 100755 (executable)
--- a/jennifer
+++ b/jennifer
@@ -2,7 +2,7 @@
 
 # Checks Debian packages from Incoming
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005  James Troup <james@nocrew.org>
-# $Id: jennifer,v 1.62 2005-12-05 04:54:29 ajt Exp $
+# $Id: jennifer,v 1.63 2005-12-05 05:08:10 ajt Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@ re_strip_revision = re.compile(r"-([^-]+)$");
 ################################################################################
 
 # Globals
-jennifer_version = "$Revision: 1.62 $";
+jennifer_version = "$Revision: 1.63 $";
 
 Cnf = None;
 Options = None;
@@ -1127,7 +1127,7 @@ def move_to_dir (dest, perms=0660, changesperms=0664):
 ################################################################################
 
 def is_unembargo ():
-    if os.getcwd() == Cnf["Dir::Queue::Disembargo"]:
+    if pkg.directory == Cnf["Dir::Queue::Disembargo"]:
         if changes["architecture"].has_key("source"):
             if Options["No-Action"]: return 1