# Checks Debian packages from Incoming
# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 James Troup <james@nocrew.org>
-# $Id: jennifer,v 1.63 2005-12-05 05:08:10 ajt Exp $
+# $Id: jennifer,v 1.65 2005-12-05 05:35:47 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
################################################################################
# Globals
-jennifer_version = "$Revision: 1.63 $";
+jennifer_version = "$Revision: 1.65 $";
Cnf = None;
Options = None;
def move_to_dir (dest, perms=0660, changesperms=0664):
utils.move (pkg.changes_file, dest, perms=changesperms);
+ file_keys = files.keys();
for file in file_keys:
utils.move (file, dest, perms=perms);
################################################################################
def is_unembargo ():
- if pkg.directory == Cnf["Dir::Queue::Disembargo"]:
+ q = Katie.projectB.query(
+ "SELECT package FROM disembargo WHERE package = '%s' AND version = '%s'" %
+ (changes["source"], changes["version"]))
+ ql = q.getresult()
+ if ql:
+ return 1
+
+ if pkg.directory == Cnf["Dir::Queue::Disembargo"].rstrip("/"):
if changes["architecture"].has_key("source"):
if Options["No-Action"]: return 1
Katie.projectB.query(
"INSERT INTO disembargo (package, version) VALUES ('%s', '%s')" %
- (changes["package"], changes["version"]))
+ (changes["source"], changes["version"]))
+ return 1
- q = Katie.projectB.query(
- "SELECT package FROM disembargo WHERE package = '%s' AND version = '%s'" %
- (changes["package"], changes["version"]))
- ql = q.getresult()
- if ql:
- return 1
return 0
def queue_unembargo (summary):
Logger.log(["Moving to unembargoed", pkg.changes_file]);
Katie.dump_vars(Cnf["Dir::Queue::Unembargoed"]);
-
- file_keys = files.keys();
-
move_to_dir(Cnf["Dir::Queue::Unembargoed"])
Katie.queue_build("unembargoed", Cnf["Dir::Queue::Unembargoed"])
Logger.log(["Moving to embargoed", pkg.changes_file]);
Katie.dump_vars(Cnf["Dir::Queue::Embargoed"]);
-
- file_keys = files.keys();
-
move_to_dir(Cnf["Dir::Queue::Embargoed"])
Katie.queue_build("embargoed", Cnf["Dir::Queue::Embargoed"])
Logger.log(["Moving to byhand", pkg.changes_file]);
Katie.dump_vars(Cnf["Dir::Queue::Byhand"]);
-
- file_keys = files.keys();
-
move_to_dir(Cnf["Dir::Queue::Byhand"])
# Check for override disparities
Logger.log(["Moving to new", pkg.changes_file]);
Katie.dump_vars(Cnf["Dir::Queue::New"]);
-
- file_keys = files.keys();
-
move_to_dir(Cnf["Dir::Queue::New"])
if not Options["No-Mail"]: