From d18cb779351f1803efc61e27f248b6f33d95756e Mon Sep 17 00:00:00 2001 From: Anthony Towns Date: Mon, 5 Dec 2005 05:08:10 +0000 Subject: [PATCH] is_unembargo is run after we've cd'ed into holding --- db_access.py | 3 ++- jennifer | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/db_access.py b/db_access.py index 45ce1c1f..cdc113f7 100644 --- a/db_access.py +++ b/db_access.py @@ -2,7 +2,7 @@ # DB access fucntions # Copyright (C) 2000, 2001, 2002, 2003, 2004 James Troup -# $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 71544043..08cc5533 100755 --- a/jennifer +++ b/jennifer @@ -2,7 +2,7 @@ # Checks Debian packages from Incoming # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 James Troup -# $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 -- 2.39.5