Commit c70b340c authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

Close requests before accepting



When auto-accepting a request, we need to close the package request
before performing the actual action (disown/deletion/merge). Otherwise,
the former maintainer is not included in the Cc list of the
acceptance/rejection notification email.

Signed-off-by: default avatarLukas Fleischer <archlinux@cryptocrack.de>
parent 98235c83
......@@ -511,6 +511,16 @@ function pkgbase_delete ($base_ids, $merge_base_id, $via) {
}
}
/*
* Close package request if the deletion was initiated through the
* request interface. NOTE: This needs to happen *before* the actual
* deletion. Otherwise, the former maintainer will not be included in
* the Cc list of the request notification email.
*/
if ($via) {
pkgreq_close(intval($via), 'accepted', '');
}
if ($merge_base_id) {
/* Merge comments */
$q = "UPDATE PackageComments ";
......@@ -544,10 +554,6 @@ function pkgbase_delete ($base_ids, $merge_base_id, $via) {
$q = "DELETE FROM PackageBases WHERE ID IN (" . implode(",", $base_ids) . ")";
$dbh->exec($q);
if ($via) {
pkgreq_close(intval($via), 'accepted', '');
}
return array(true, __("The selected packages have been deleted."));
}
......@@ -579,6 +585,16 @@ function pkgbase_adopt ($base_ids, $action=true, $via) {
}
}
/*
* Close package request if the disownment was initiated through the
* request interface. NOTE: This needs to happen *before* the actual
* disown operation. Otherwise, the former maintainer will not be
* included in the Cc list of the request notification email.
*/
if ($via) {
pkgreq_close(intval($via), 'accepted', '');
}
$dbh = DB::connect();
$q = "UPDATE PackageBases ";
......@@ -600,10 +616,6 @@ function pkgbase_adopt ($base_ids, $action=true, $via) {
$dbh->exec($q);
if ($via) {
pkgreq_close(intval($via), 'accepted', '');
}
if ($action) {
pkgbase_notify(account_from_sid($_COOKIE["AURSID"]), $base_ids);
return array(true, __("The selected packages have been adopted."));
......
......@@ -189,13 +189,19 @@ function pkgreq_file($ids, $type, $merge_into, $comments) {
if ($type == 'orphan' && $details['OutOfDateTS'] > 0 &&
time() - $details['OutOfDateTS'] >= $AUTO_ORPHAN_AGE &&
$AUTO_ORPHAN_AGE > 0) {
/*
* Close package request. NOTE: This needs to happen *before*
* the actual disown operation. Otherwise, the former
* maintainer will not be included in the Cc list of the
* request notification email.
*/
pkgreq_close($request_id, "accepted",
"The package base has been flagged out-of-date " .
"since " . $out_of_date_time . ".", true);
$q = "UPDATE PackageBases SET MaintainerUID = NULL ";
$q.= "WHERE ID = " . $base_id;
$dbh->exec($q);
$out_of_date_time = gmdate("Y-m-d", intval($details["OutOfDateTS"]));
pkgreq_close($request_id, "accepted",
"The package base has been flagged out-of-date " .
"since " . $out_of_date_time . ".", true);
}
return array(true, __("Added request successfully."));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment