Signed-off-by: Frank Lichtenheld <djpig@debian.org>
answer = m.group(1)
answer = answer[:1].upper()
answer = m.group(1)
answer = answer[:1].upper()
+ session = DBConn().session()
+
if answer == 'R':
os.chdir(u.pkg.directory)
u.do_reject(0, pi)
elif answer == 'A':
if answer == 'R':
os.chdir(u.pkg.directory)
u.do_reject(0, pi)
elif answer == 'A':
- u.pkg.add_known_changes(holding.holding_dir)
- u.accept(summary, short_summary)
+ u.pkg.add_known_changes(holding.holding_dir, session)
+ u.accept(summary, short_summary, session)
u.check_override()
u.remove()
elif answer == queuekey:
u.check_override()
u.remove()
elif answer == queuekey:
- u.pkg.add_known_changes(holding.holding_dir)
- QueueInfo[qu]["process"](u, summary, short_summary)
+ u.pkg.add_known_changes(holding.holding_dir, session)
+ QueueInfo[qu]["process"](u, summary, short_summary, session)
u.remove()
elif answer == 'Q':
sys.exit(0)
u.remove()
elif answer == 'Q':
sys.exit(0)
###############################################################################
def cleanup():
###############################################################################
def cleanup():
return summary
###########################################################################
return summary
###########################################################################
-
- def accept (self, summary, short_summary, session):
+ @session_wrapper
+ def accept (self, summary, short_summary, session=None):
-def queue_unembargo(u, summary, short_summary):
+def queue_unembargo(u, summary, short_summary, session=None):
return package_to_queue(u, summary, short_summary, "Unembargoed",
perms=0660, build=True, announce='process-unchecked.accepted')
return package_to_queue(u, summary, short_summary, "Unembargoed",
perms=0660, build=True, announce='process-unchecked.accepted')
# if embargoed queues are enabled always embargo
return True
# if embargoed queues are enabled always embargo
return True
-def queue_embargo(u, summary, short_summary):
+def queue_embargo(u, summary, short_summary, session=None):
return package_to_queue(u, summary, short_summary, "Unembargoed",
perms=0660, build=True, announce='process-unchecked.accepted')
return package_to_queue(u, summary, short_summary, "Unembargoed",
perms=0660, build=True, announce='process-unchecked.accepted')
def is_stableupdate(u):
return package_to_suite(u, 'proposed-updates')
def is_stableupdate(u):
return package_to_suite(u, 'proposed-updates')
-def do_stableupdate(u, summary, short_summary):
+def do_stableupdate(u, summary, short_summary, session=None):
return package_to_queue(u, summary, short_summary, "ProposedUpdates",
perms=0664, build=False, announce=None)
return package_to_queue(u, summary, short_summary, "ProposedUpdates",
perms=0664, build=False, announce=None)
def is_oldstableupdate(u):
return package_to_suite(u, 'oldstable-proposed-updates')
def is_oldstableupdate(u):
return package_to_suite(u, 'oldstable-proposed-updates')
-def do_oldstableupdate(u, summary, short_summary):
+def do_oldstableupdate(u, summary, short_summary, session=None):
return package_to_queue(u, summary, short_summary, "OldProposedUpdates",
perms=0664, build=False, announce=None)
return package_to_queue(u, summary, short_summary, "OldProposedUpdates",
perms=0664, build=False, announce=None)
return any_auto and all_auto
return any_auto and all_auto
-def do_autobyhand(u, summary, short_summary):
+def do_autobyhand(u, summary, short_summary, session=None):
print "Attempting AUTOBYHAND."
byhandleft = True
for f, entry in u.pkg.files.items():
print "Attempting AUTOBYHAND."
byhandleft = True
for f, entry in u.pkg.files.items():
byhandleft = True
if byhandleft:
byhandleft = True
if byhandleft:
- do_byhand(u, summary, short_summary)
+ do_byhand(u, summary, short_summary, session)
- u.accept(summary, short_summary)
+ u.accept(summary, short_summary, session)
- # XXX: We seem to be missing a u.remove() here
- # This might explain why we get byhand leftovers in unchecked - mhy
################################################################################
################################################################################
-def do_byhand(u, summary, short_summary):
+def do_byhand(u, summary, short_summary, session=None):
return package_to_queue(u, summary, short_summary, "Byhand",
perms=0660, build=False, announce=None)
return package_to_queue(u, summary, short_summary, "Byhand",
perms=0660, build=False, announce=None)
-def acknowledge_new(u, summary, short_summary):
+def acknowledge_new(u, summary, short_summary, session=None):
cnf = Config()
print "Moving to NEW queue."
cnf = Config()
print "Moving to NEW queue."