- Aur-dev - lists.archlinux.org

Search or info by "provides"
by Sergey Petrenko 02 Feb '19

02 Feb '19

Hi, I’m interested in implementing this one way or another. I have found thread from march 2018 concerning this feature, but without any final resolution. What is the status? Will you accept extension of /search over "provides" or I’ll have to wait till RPC v6 is ready?

1 0

[PATCH] aurblup: make provider updates more robust
by Lukas Fleischer 21 Jan '19

21 Jan '19

Prevent from corner cases, such as failing unique key constraints when a provided package changes from lower case to upper case. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/scripts/aurblup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aurweb/scripts/aurblup.py b/aurweb/scripts/aurblup.py index 1433173..a7d43f1 100755 --- a/aurweb/scripts/aurblup.py +++ b/aurweb/scripts/aurblup.py @@ -39,13 +39,13 @@ def main(): cur = conn.execute("SELECT Name, Provides FROM OfficialProviders") oldproviders = set(cur.fetchall()) + for pkg, provides in oldproviders.difference(providers): + conn.execute("DELETE FROM OfficialProviders " + "WHERE Name = ? AND Provides = ?", [pkg, provides]) for pkg, provides in providers.difference(oldproviders): repo = repomap[(pkg, provides)] conn.execute("INSERT INTO OfficialProviders (Name, Repo, Provides) " "VALUES (?, ?, ?)", [pkg, repo, provides]) - for pkg, provides in oldproviders.difference(providers): - conn.execute("DELETE FROM OfficialProviders " - "WHERE Name = ? AND Provides = ?", [pkg, provides]) conn.commit() conn.close() -- 2.20.1

2 2

[PATCH] Quote MySql 8.0 reserved keywords
by Florian Pritz 14 Jan '19

14 Jan '19

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- aurweb/git/update.py | 4 ++-- schema/aur-schema.sql | 4 ++-- upgrading/3.0.0.txt | 4 ++-- upgrading/3.1.0.txt | 2 +- web/lib/aurjson.class.php | 6 +++--- web/lib/pkgfuncs.inc.php | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/aurweb/git/update.py b/aurweb/git/update.py index 0614e9e..39128f8 100755 --- a/aurweb/git/update.py +++ b/aurweb/git/update.py @@ -180,13 +180,13 @@ def save_metadata(metadata, conn, user): # Add package groups. if 'groups' in pkginfo: for group in pkginfo['groups']: - cur = conn.execute("SELECT ID FROM Groups WHERE Name = ?", + cur = conn.execute("SELECT ID FROM `Groups` WHERE Name = ?", [group]) row = cur.fetchone() if row: groupid = row[0] else: - cur = conn.execute("INSERT INTO Groups (Name) VALUES (?)", + cur = conn.execute("INSERT INTO `Groups` (Name) VALUES (?)", [group]) conn.commit() groupid = cur.lastrowid diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 79de3f2..f05f40a 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -149,7 +149,7 @@ CREATE TABLE PackageLicenses ( -- Information about groups -- -CREATE TABLE Groups ( +CREATE TABLE `Groups` ( ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, Name VARCHAR(255) NOT NULL, PRIMARY KEY (ID), @@ -164,7 +164,7 @@ CREATE TABLE PackageGroups ( GroupID INTEGER UNSIGNED NOT NULL, PRIMARY KEY (PackageID, GroupID), FOREIGN KEY (PackageID) REFERENCES Packages(ID) ON DELETE CASCADE, - FOREIGN KEY (GroupID) REFERENCES Groups(ID) ON DELETE CASCADE + FOREIGN KEY (GroupID) REFERENCES `Groups`(ID) ON DELETE CASCADE ) ENGINE = InnoDB; diff --git a/upgrading/3.0.0.txt b/upgrading/3.0.0.txt index b134b79..4f9c70f 100644 --- a/upgrading/3.0.0.txt +++ b/upgrading/3.0.0.txt @@ -200,7 +200,7 @@ CREATE TABLE PackageRelations ( 17. Create tables to store package groups: ---- -CREATE TABLE Groups ( +CREATE TABLE `Groups` ( ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, Name VARCHAR(64) NOT NULL, PRIMARY KEY (ID), @@ -211,7 +211,7 @@ CREATE TABLE PackageGroups ( GroupID INTEGER UNSIGNED NOT NULL, PRIMARY KEY (PackageID, GroupID), FOREIGN KEY (PackageID) REFERENCES Packages(ID) ON DELETE CASCADE, - FOREIGN KEY (GroupID) REFERENCES Groups(ID) ON DELETE CASCADE + FOREIGN KEY (GroupID) REFERENCES `Groups`(ID) ON DELETE CASCADE ) ENGINE = InnoDB; ---- diff --git a/upgrading/3.1.0.txt b/upgrading/3.1.0.txt index 2fc1614..e883a6c 100644 --- a/upgrading/3.1.0.txt +++ b/upgrading/3.1.0.txt @@ -7,7 +7,7 @@ ALTER TABLE Packages MODIFY Name VARCHAR(255) NOT NULL, MODIFY Version VARCHAR(255) NOT NULL DEFAULT ''; ALTER TABLE Licenses MODIFY Name VARCHAR(255) NOT NULL; -ALTER TABLE Groups MODIFY Name VARCHAR(255) NOT NULL; +ALTER TABLE `Groups` MODIFY Name VARCHAR(255) NOT NULL; ALTER TABLE PackageDepends MODIFY DepCondition VARCHAR(255); ALTER TABLE PackageRelations MODIFY RelCondition VARCHAR(255); ---- diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index c51e9c2..c275d21 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -284,10 +284,10 @@ private function get_extended_fields($pkgid, $base_id) { "LEFT JOIN RelationTypes " . "ON RelationTypes.ID = PackageRelations.RelTypeID " . "WHERE PackageRelations.PackageID = " . $pkgid . " " . - "UNION SELECT 'groups' AS Type, Groups.Name, '' AS Cond " . - "FROM Groups INNER JOIN PackageGroups " . + "UNION SELECT 'groups' AS Type, `Groups`.`Name`, '' AS Cond " . + "FROM `Groups` INNER JOIN PackageGroups " . "ON PackageGroups.PackageID = " . $pkgid . " " . - "AND PackageGroups.GroupID = Groups.ID " . + "AND PackageGroups.GroupID = `Groups`.ID " . "UNION SELECT 'license' AS Type, Licenses.Name, '' AS Cond " . "FROM Licenses INNER JOIN PackageLicenses " . "ON PackageLicenses.PackageID = " . $pkgid . " " . diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index ced1f8e..00f0cc4 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -188,7 +188,7 @@ function pkg_groups($pkgid) { $pkgid = intval($pkgid); if ($pkgid > 0) { $dbh = DB::connect(); - $q = "SELECT g.Name FROM Groups g "; + $q = "SELECT g.Name FROM `Groups` g "; $q.= "INNER JOIN PackageGroups pg ON pg.GroupID = g.ID "; $q.= "WHERE pg.PackageID = ". $pkgid; $result = $dbh->query($q); -- 2.20.1

2 1

Fwd: [PATCH] Make delete and merge links create an auto-accepted request
by Eli Schwartz 23 Dec '18

23 Dec '18

Plain copy of reply -------- Forwarded Message -------- Subject: Re: [PATCH] Make delete and merge links create an auto-accepted request Date: Sun, 23 Dec 2018 23:19:47 +0100 From: Johannes Löthberg <johannes(a)kyriasis.com> To: Eli Schwartz <eschwartz(a)archlinux.org> Excerpts from Eli Schwartz's message of December 23, 2018 22:58: > On 12/23/18 4:14 PM, Johannes Löthberg wrote: >> This lets us have a better paper-trail over what happens in the AUR. > I'm opposed to this change. > > The purpose of those links is arguably to do things in exceptional > circumstances. There are cases where an auto-accepted request is simply > uninteresting information. e.g., the following cases: > > - user submits deletion request, Eli Schwartz uses "close" instead of > "accept", with the message "merged instead". Do we really need > additional notifications here? > I think that is a better portrayal of reality, yes. I do not see there being any really justified reasons for anyone being able to delete a package without a request. > - deletion of spam packages > I believe that that is still just as interesting to have in the history. We've already had quite a few cases where there was confusion as to what happened to a package just because it was deleted directly. > Moreover, the current proposal is simply inferior in every possible way > compared to simply submitting a request, then accepting it. That way you > get to leave a message saying why it happened... I would simply never > ever use the delete/merge links if I actually wanted to send out > notifications. > It's hardly inferior, it's just different. There are obviously TUs that currently use them but don't want to leave a message, this still lets them do exactly that. And even if we would not actually create an auto-accepted request for it, I believe that it is wrong to not always send out at least a notification when a package is deleted. Having an actual request created just makes it easier to see them along with all other changes. > On top of this, where is the notification for orphaning packages against > the will of the maintainer? > That is fundamentally a different change and feature that has nothing to do with this patch. > > It's basically accepted practice regardless that when TUs adopt a > package into community, they submit a deletion request and then accept > it. This will traditionally include the high-content comment "moved to > community". > Sure. Except for when they don't. > The current patchset was proposed in response to one TU on IRC, Incorrect. I have been planning on doing this for months, and talked to Lukas about it months ago as well. > who feels strongly about the goal of said paper trail and desired to have > the entire feature removed from aurweb altogether. I propose instead > that we follow my recommendation to document on the wiki at > https://wiki.archlinux.org/index.php/AUR_Trusted_User_Guidelines that > TUs should submit a deletion request *with the relevant comment* rather > than deleting the package. > > I see no reason to modify the emergency override tools. Before you get to call them "emergency override tools" we're going to both need to *clearly* label them as such, and preferably move them to a separate section. As it is they are, and will continue to be, "just tools," especially since they are the easiest option for performing these actions. > Note: regarding the person who suggested on IRC that the links should be > removed, the orphan link in particular is utterly crucial to remain, > since aurweb includes a feature to accept an orphan request early by > leaving a comment and *not* actually orphaning the package. This > requires the TU to manually use the orphan link. If orphan requests were > given fair treatment with the other two request types, this would result > in a second notification every time it was used. > More generally, if you wish to leave a comment in the acceptance > notification, you must use the same comment form followed by manual > followup when closing a deletion or merge request as well (although > those are not locked for the duration of a 14-day grace period). > But then again, there is no reason to actually implement it that simplistically either. -- Sincerely, Johannes Löthberg

1 0

Re: [PATCH] Make delete and merge links create an auto-accepted request
by Eli Schwartz 23 Dec '18

23 Dec '18

This accidentally did not get CC'ed to the list... I've inlined my response. On 12/23/18 5:19 PM, Johannes Löthberg wrote: > Excerpts from Eli Schwartz's message of December 23, 2018 22:58: >> On 12/23/18 4:14 PM, Johannes Löthberg wrote: >>> This lets us have a better paper-trail over what happens in the AUR. >> I'm opposed to this change. >> >> The purpose of those links is arguably to do things in exceptional >> circumstances. There are cases where an auto-accepted request is simply >> uninteresting information. e.g., the following cases: >> >> - user submits deletion request, Eli Schwartz uses "close" instead of >> "accept", with the message "merged instead". Do we really need >> additional notifications here? >> > > I think that is a better portrayal of reality, yes. I do not see there > being any really justified reasons for anyone being able to delete a > package without a request. There was a request. :p >> - deletion of spam packages >> > > I believe that that is still just as interesting to have in the history. > > We've already had quite a few cases where there was confusion as to what > happened to a package just because it was deleted directly. Eh, not sure I really agree that spam is interesting. >> Moreover, the current proposal is simply inferior in every possible way >> compared to simply submitting a request, then accepting it. That way you >> get to leave a message saying why it happened... I would simply never >> ever use the delete/merge links if I actually wanted to send out >> notifications. >> > > It's hardly inferior, it's just different. There are obviously TUs that > currently use them but don't want to leave a message, this still lets > them do exactly that. And even if we would not actually create an > auto-accepted request for it, I believe that it is wrong to not always > send out at least a notification when a package is deleted. Having an > actual request created just makes it easier to see them along with all > other changes. I'd much prefer to see the ability to include a comment on the direct action interface then. :D I don't believe that would make it mandatory to leave a comment -- it would just give one the option to. >> On top of this, where is the notification for orphaning packages against >> the will of the maintainer? >> > > That is fundamentally a different change and feature that has nothing to > do with this patch. I see it as the same change/feature, adding a paper trail to to request-like actions. Could you clarify why you see it as different? >> It's basically accepted practice regardless that when TUs adopt a >> package into community, they submit a deletion request and then accept >> it. This will traditionally include the high-content comment "moved to >> community". >> > > Sure. Except for when they don't. > >> The current patchset was proposed in response to one TU on IRC, > > Incorrect. I have been planning on doing this for months, and talked to > Lukas about it months ago as well. Sorry for jumping to conclusions. :( All I saw was today's mention on IRC. >> who feels strongly about the goal of said paper trail and desired to have >> the entire feature removed from aurweb altogether. I propose instead >> that we follow my recommendation to document on the wiki at >> https://wiki.archlinux.org/index.php/AUR_Trusted_User_Guidelines that >> TUs should submit a deletion request *with the relevant comment* rather >> than deleting the package. >> >> I see no reason to modify the emergency override tools. > > Before you get to call them "emergency override tools" we're going to > both need to *clearly* label them as such, and preferably move them to a > separate section. As it is they are, and will continue to be, "just > tools," especially since they are the easiest option for performing > these actions. Fair point, although I do rather consider them as such I guess this is not really clear. Especially since I still don't want to use them without a comment box... (I would like to see more tools, "just" or otherwise, since in some ways the TU interface is rather rough. Deleting comments one by one is still the only way to deal with the repeated essay writing/gaming sites/MS Word spam too.) >> Note: regarding the person who suggested on IRC that the links should be >> removed, the orphan link in particular is utterly crucial to remain, >> since aurweb includes a feature to accept an orphan request early by >> leaving a comment and *not* actually orphaning the package. This >> requires the TU to manually use the orphan link. If orphan requests were >> given fair treatment with the other two request types, this would result >> in a second notification every time it was used. >> More generally, if you wish to leave a comment in the acceptance >> notification, you must use the same comment form followed by manual >> followup when closing a deletion or merge request as well (although >> those are not locked for the duration of a 14-day grace period). >> > > But then again, there is no reason to actually implement it that > simplistically either. Okay. I think, as I said above, that the current available tools are a bit primitive in how they expose functionality regardless. Maybe there is some way we could revamp all this in the process? Maybe if we exposed the comment box in the "delete/merge/orphan this package" landing page, we could unify comments and notifications across all three action paths? (request-accept, request-close, and direct action links) Rather than submitting an auto-accepted request, we'd simply prompt for an optional comment, then perform the final notification (and if "via" is passed, do so using pkgreq_close, else just use notify). This would also mean we only send out one email, instead of two. -- Eli Schwartz Bug Wrangler and Trusted User

1 0

[PATCH] Make delete and merge links create an auto-accepted request
by Johannes Löthberg 23 Dec '18

23 Dec '18

This lets us have a better paper-trail over what happens in the AUR. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- web/html/pkgbase.php | 23 +++++++++++++---------- web/lib/pkgreqfuncs.inc.php | 14 +++++++------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 46ad77e..8efa51e 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -70,12 +70,10 @@ if (check_token()) { list($ret, $output) = pkgbase_vote($ids, false); } elseif (current_action("do_Delete")) { if (isset($_POST['confirm'])) { - if (!isset($_POST['merge_Into']) || empty($_POST['merge_Into'])) { - list($ret, $output) = pkgbase_delete($ids, NULL, $via); - unset($_GET['ID']); - unset($base_id); - } - else { + $type = "deletion"; + $merge_base_id = NULL; + if (isset($_POST['merge_Into']) && !empty($_POST['merge_Into'])) { + $type = "merge"; $merge_base_id = pkgbase_from_name($_POST['merge_Into']); if (!$merge_base_id) { $output = __("Cannot find package to merge votes and comments into."); @@ -83,12 +81,17 @@ if (check_token()) { } elseif (in_array($merge_base_id, $ids)) { $output = __("Cannot merge a package base with itself."); $ret = false; - } else { + } + } + if ($type == "deletion" || ($type == "merge" && $merge_base_id)) { + list($ret, $output, $request_id) = pkgreq_file($ids, $type, $_POST['merge_Into'], + "Trusted User-requested auto-accepted ".$type."."); + if ($ret) { list($ret, $output) = pkgbase_delete($ids, $merge_base_id, $via); - unset($_GET['ID']); - unset($base_id); } } + unset($_GET['ID']); + unset($base_id); } else { $output = __("The selected packages have not been deleted, check the confirmation checkbox."); @@ -112,7 +115,7 @@ if (check_token()) { } elseif (current_action("do_SetKeywords")) { list($ret, $output) = pkgbase_set_keywords($base_id, preg_split("/[\s,;]+/", $_POST['keywords'], -1, PREG_SPLIT_NO_EMPTY)); } elseif (current_action("do_FileRequest")) { - list($ret, $output) = pkgreq_file($ids, $_POST['type'], $_POST['merge_into'], $_POST['comments']); + list($ret, $output, $_reqid) = pkgreq_file($ids, $_POST['type'], $_POST['merge_into'], $_POST['comments']); } elseif (current_action("do_CloseRequest")) { list($ret, $output) = pkgreq_close($_POST['reqid'], $_POST['reason'], $_POST['comments']); } elseif (current_action("do_EditComaintainers")) { diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index 774ebe7..a15f101 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -124,19 +124,19 @@ function pkgreq_get_creator_email($id) { */ function pkgreq_file($ids, $type, $merge_into, $comments) { if (!has_credential(CRED_PKGREQ_FILE)) { - return array(false, __("You must be logged in to file package requests.")); + return array(false, __("You must be logged in to file package requests."), NULL); } if (!empty($merge_into) && !preg_match("/^[a-z0-9][a-z0-9\.+_-]*$/D", $merge_into)) { - return array(false, __("Invalid name: only lowercase letters are allowed.")); + return array(false, __("Invalid name: only lowercase letters are allowed."), NULL); } if (!empty($merge_into) && !pkgbase_from_name($merge_into)) { - return array(false, __("Cannot find package to merge votes and comments into.")); + return array(false, __("Cannot find package to merge votes and comments into."), NULL); } if (empty($comments)) { - return array(false, __("The comment field must not be empty.")); + return array(false, __("The comment field must not be empty."), NULL); } $dbh = DB::connect(); @@ -147,7 +147,7 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { $pkgbase_name = pkgbase_name_from_id($base_id); if ($merge_into == $pkgbase_name) { - return array(false, __("Cannot merge a package base with itself.")); + return array(false, __("Cannot merge a package base with itself."), NULL); } $q = "SELECT ID FROM RequestTypes WHERE Name = " . $dbh->quote($type); @@ -155,7 +155,7 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { if ($row = $result->fetch(PDO::FETCH_ASSOC)) { $type_id = $row['ID']; } else { - return array(false, __("Invalid request type.")); + return array(false, __("Invalid request type."), NULL); } $q = "INSERT INTO PackageRequests "; @@ -208,7 +208,7 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { pkgbase_delete(array($base_id), NULL, NULL, true); } - return array(true, __("Added request successfully.")); + return array(true, __("Added request successfully."), $request_id); } /** -- 2.20.1

2 1

[PATCH] web: remove unused $window_length
by Jelle van der Waa 20 Dec '18

20 Dec '18

From: Jelle van der Waa <jelle(a)vdwaa.nl> --- web/lib/aurjson.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index c51e9c2..d0091f1 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -152,7 +152,6 @@ class AurJSON { return false; } - $window_length = config_get("ratelimit", "window_length"); $this->update_ratelimit($ip); $stmt = $this->dbh->prepare(" SELECT Requests FROM ApiRateLimit -- 2.20.1

1 0

Writing PKGBUILD for libaacs keydb.cfg
by hagar 04 Nov '18

04 Nov '18

hello all, I need to ask a couple of questions regarding the KEYDB.cfg file for libaacs and bluray disks. I have discovered that the file can be installed in /etc/xdg/aacs/ This is the systemwide config directory for libaacs on linux. 1. Is it preferable to write a periodic download for systemd or to download the file itself? Could this be a legal issue? 2. Can an install script modify the users home directories - ie. create the .config/buk directories. 3. Would it be OK to link the users vuk directory to a system wide one in say /etc/xdg/aacs/vuk so that all users can share the keys? I would rather ask a silly question than create a problem later. I dont want to go against any goup preferences. Thanks Macca

1 0

Account Suspended, No Reason Given
by shoober420 04 Nov '18

04 Nov '18

I recently tried to be the maintainer for an package that hasn't been updated in quite some time. I've been using my own PKGBUILD for the particular package with great success, and currently am maintaining the "lib32-sdl2-hg" 32 bit version of this package. Upon request of this package, It was denied for no reason given, except a disrespectful message from coderob and I quote. "come back with a better request, my dude" So I did, I requested to maintain the package again, and was denied, then my account got suspended. Whats the deal here? I wasn't warned about anything I may have done wrong, and I'm currently maintaining two packages, and co-maintaining another one, which I no longer can access. Please unsuspend my account so I can maintain my packages. Vincent Grande <shoober420>

3 2

[aur-dev][PATCH] Fix notifications emails going to the right people, part #2
by Eli Schwartz 26 Oct '18

26 Oct '18

Notifications are still going to the wrong people. We tried to fix this in commit b702e5c0e7f13103fc764b7e5613f78f3e7acd30, but only fixed it for the python callers. There's another caller in the php code, which needs to use the right order of arguments as well. Fixes FS#60602 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- The division between the python and php code is, well, sort of awkward, who knew? And I guess the php callers would be the more common cause here, so... Anyway, hopefully this actually fixes things for the common case. web/lib/pkgbasefuncs.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index b39bca5..1df21a2 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -733,7 +733,7 @@ function pkgbase_adopt ($base_ids, $action=true, $via) { } foreach ($base_ids as $base_id) { - notify(array($action ? 'adopt' : 'disown', $base_id, $uid)); + notify(array($action ? 'adopt' : 'disown', $uid, $base_id)); } if ($action) { @@ -1204,7 +1204,7 @@ function pkgbase_set_comaintainers($base_id, $users, $override=false) { foreach ($uids_new as $uid) { if (in_array($uid, $uids_add)) { $q = sprintf("INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (%d, %d, %d)", $base_id, $uid, $i); - notify(array('comaintainer-add', $base_id, $uid)); + notify(array('comaintainer-add', $uid, $base_id)); } else { $q = sprintf("UPDATE PackageComaintainers SET Priority = %d WHERE PackageBaseID = %d AND UsersID = %d", $i, $base_id, $uid); } @@ -1216,7 +1216,7 @@ function pkgbase_set_comaintainers($base_id, $users, $override=false) { foreach ($uids_rem as $uid) { $q = sprintf("DELETE FROM PackageComaintainers WHERE PackageBaseID = %d AND UsersID = %d", $base_id, $uid); $dbh->exec($q); - notify(array('comaintainer-remove', $base_id, $uid)); + notify(array('comaintainer-remove', $uid, $base_id)); } return array(true, __("The package base co-maintainers have been updated.")); -- 2.19.1

1 1