################################################################################
def package_to_suite(u, suite_name, session):
- if not u.pkg.changes["distribution"].has_key(suite):
+ if not u.pkg.changes["distribution"].has_key(suite_name):
return False
ret = True
if not u.pkg.changes["architecture"].has_key("source"):
q = session.query(SrcAssociation.sa_id)
- q = q.join(Suite).filter_by(suite_name=suite)
+ q = q.join(Suite).filter_by(suite_name=suite_name)
q = q.join(DBSource).filter_by(source=u.pkg.changes['source'])
q = q.filter_by(version=u.pkg.changes['version']).limit(1)
return ret
-def package_to_queue(u, summary, short_summary, queue, perms=0660, announce=None):
+def package_to_queue(u, summary, short_summary, queue, chg, session, announce=None):
cnf = Config()
dir = queue.path
print "Moving to %s policy queue" % queue.queue_name.upper()
u.logger.log(["Moving to %s" % queue.queue_name, u.pkg.changes_file])
- u.move_to_dir(dir, perms=perms)
- # TODO: Put building logic in here? We used to take a build=bool argument
+ u.move_to_queue(queue)
+ chg.in_queue_id = queue.policy_queue_id
+ session.add(chg)
+ session.commit()
# Check for override disparities
u.check_override()
# Send accept mail, announce to lists and close bugs
- if announce and not cnf["Dinstall::Options::No-Mail"]:
+ if announce:
template = os.path.join(cnf["Dir::Templates"], announce)
u.update_subst()
- u.Subst["__SUITE__"] = ""
mail_message = utils.TemplateSubst(u.Subst, template)
utils.send_mail(mail_message)
u.announce(short_summary, True)
return any_auto and all_auto
-def do_autobyhand(u, summary, short_summary, session=None):
+def do_autobyhand(u, summary, short_summary, chg, session):
print "Attempting AUTOBYHAND."
- byhandleft = True
+ byhandleft = False
for f, entry in u.pkg.files.items():
byhandfile = f
if result == 0:
os.unlink(byhandfile)
- del entry
+ del u.pkg.files[f]
else:
print "Error processing %s, left as byhand." % (f)
byhandleft = True
if byhandleft:
- do_byhand(u, summary, short_summary, session)
+ do_byhand(u, summary, short_summary, chg, session)
else:
u.accept(summary, short_summary, session)
u.check_override()
return True
return False
-def do_byhand(u, summary, short_summary, session=None):
- return package_to_queue(u, summary, short_summary, "Byhand",
- perms=0660, build=False, announce=None)
+def do_byhand(u, summary, short_summary, chg, session):
+ return package_to_queue(u, summary, short_summary,
+ get_policy_queue('byhand'), chg, session,
+ announce=None)
################################################################################
return True
return False
-def acknowledge_new(u, summary, short_summary, session=None):
+def acknowledge_new(u, summary, short_summary, chg, session):
cnf = Config()
print "Moving to NEW queue."
u.logger.log(["Moving to new", u.pkg.changes_file])
- u.move_to_dir(cnf["Dir::Queue::New"], perms=0640, changesperms=0644)
+ q = get_policy_queue('new', session)
- if not cnf["Dinstall::Options::No-Mail"]:
- print "Sending new ack."
- template = os.path.join(cnf["Dir::Templates"], 'process-unchecked.new')
- u.update_subst()
- u.Subst["__SUMMARY__"] = summary
- new_ack_message = utils.TemplateSubst(u.Subst, template)
- utils.send_mail(new_ack_message)
+ u.move_to_queue(q)
+ chg.in_queue_id = q.policy_queue_id
+ session.add(chg)
+ session.commit()
+
+ print "Sending new ack."
+ template = os.path.join(cnf["Dir::Templates"], 'process-unchecked.new')
+ u.update_subst()
+ u.Subst["__SUMMARY__"] = summary
+ new_ack_message = utils.TemplateSubst(u.Subst, template)
+ utils.send_mail(new_ack_message)
################################################################################
# Statically handled queues
target = None
- for q in QueueInfo.keys():
+ for q in ["autobyhand", "byhand", "new"]:
if QueueInfo[q]["is"](u):
target = q
+ break
return target