# Checks Debian packages from Incoming
# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 James Troup <james@nocrew.org>
-# $Id: jennifer,v 1.56 2005-01-18 22:18:31 troup Exp $
+# $Id: jennifer,v 1.59 2005-11-25 09:29:54 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.56 $";
+jennifer_version = "$Revision: 1.59 $";
Cnf = None;
Options = None;
# Check for mandatory fields
for i in ("source", "binary", "architecture", "version", "distribution",
- "maintainer", "files", "changes"):
+ "maintainer", "files", "changes", "description"):
if not changes.has_key(i):
reject("%s: Missing mandatory field `%s'." % (filename, i));
return 0 # Avoid <undef> errors during later tests
changes["changedbyname"], changes["changedbyemail"]) = \
utils.fix_maintainer (changes.get("changed-by", ""));
except utils.ParseMaintError, msg:
+ (changes["changedby822"], changes["changedby2047"],
+ changes["changedbyname"], changes["changedbyemail"]) = \
+ ("", "", "", "")
reject("%s: Changed-By field ('%s') failed to parse: %s" \
% (filename, changes["changed-by"], msg));
# give these as "uploaded-to(non-mapped) suites-to-add-when-upload-obsoletes"
#
# changes["distribution-version"] looks like: {'testing': 'testing-proposed-updates'}
- if args[1] in changes["distribution"]:
+ if changes["distribution"].has_key(args[1]):
changes.setdefault("distribution-version", {})
for suite in args[2:]: changes["distribution-version"][suite]=suite
# If there isn't one, we have nothing to do. (We have reject()ed the upload already)
if not dsc_filename:
+ reject("source uploads must contain a dsc file");
return 0;
# Parse the .dsc file
(summary, short_summary) = Katie.build_summaries();
- byhand = new = "";
- for file in files.keys():
- if files[file].has_key("byhand"):
- byhand = 1
- elif files[file].has_key("new"):
- new = 1
+ # q-unapproved hax0ring
+ queues = [ "New", "Byhand" ]
+ queue_info = {
+ "New": { "is": is_new, "process": acknowledge_new },
+ "Byhand" : { "is": is_byhand, "process": do_byhand },
+ }
(prompt, answer) = ("", "XXX")
if Options["No-Action"] or Options["Automatic"]:
prompt = "[R]eject, Skip, Quit ?";
if Options["Automatic"]:
answer = 'R';
- elif new:
- print "NEW to %s\n%s%s" % (", ".join(changes["distribution"].keys()), reject_message, summary),;
- prompt = "[N]ew, Skip, Quit ?";
- if Options["Automatic"]:
- answer = 'N';
- elif byhand:
- print "BYHAND\n" + reject_message + summary,;
- prompt = "[B]yhand, Skip, Quit ?";
- if Options["Automatic"]:
- answer = 'B';
else:
- print "ACCEPT\n" + reject_message + summary,;
- prompt = "[A]ccept, Skip, Quit ?";
- if Options["Automatic"]:
- answer = 'A';
+ queue = None
+ for q in queues:
+ if queue_info[q]["is"]():
+ queue = q
+ break
+ if queue:
+ print "%s for %s\n%s%s" % (
+ queue.upper(), ", ".join(changes["distribution"].keys()),
+ reject_message, summary),
+ queuekey = queue[0].upper()
+ if queuekey in "RQSA":
+ queuekey = "D"
+ prompt = "[D]ivert, Skip, Quit ?"
+ else:
+ prompt = "[%s]%s, Skip, Quit ?" % (queuekey, queue[1:].lower())
+ if Options["Automatic"]:
+ answer = queuekey
+ else:
+ print "ACCEPT\n" + reject_message + summary,;
+ prompt = "[A]ccept, Skip, Quit ?";
+ if Options["Automatic"]:
+ answer = 'A';
while prompt.find(answer) == -1:
answer = utils.our_raw_input(prompt);
Katie.do_reject(0, reject_message);
elif answer == 'A':
accept(summary, short_summary);
- elif answer == 'B':
- do_byhand(summary);
- elif answer == 'N':
- acknowledge_new (summary);
+ elif answer == queuekey:
+ queue_info[queue]["process"](summary)
elif answer == 'Q':
sys.exit(0)
################################################################################
+def is_byhand ():
+ for file in files.keys():
+ if files[file].has_key("byhand"):
+ return 1
+ return 0
+
def do_byhand (summary):
print "Moving to BYHAND holding area."
Logger.log(["Moving to byhand", pkg.changes_file]);
################################################################################
+def is_new ():
+ for file in files.keys():
+ if files[file].has_key("new"):
+ return 1
+ return 0
+
def acknowledge_new (summary):
Subst = Katie.Subst;
# Check that we aren't going to clash with the daily cron job
- if not Options["No-Action"] and os.path.exists("%s/Archive_Maintenance_In_Progress" % (Cnf["Dir::Root"])) and not Options["No-Lock"]:
+ if not Options["No-Action"] and os.path.exists("%s/daily.lock" % (Cnf["Dir::Lock"])) and not Options["No-Lock"]:
utils.fubar("Archive maintenance in progress. Try again later.");
# Obtain lock if not in no-action mode and initialize the log