summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2018-08-10 23:26:28 +0200
committerLukas Fleischer <lfleischer@archlinux.org>2018-08-12 09:38:19 +0200
commitb702e5c0e7f13103fc764b7e5613f78f3e7acd30 (patch)
tree8d9a8bf839a926ef8f520d76168a090ad29f56b9
parent257115943e2a3350bf29ad3ab72fc50a6ae60e7d (diff)
downloadaur-b702e5c0e7f13103fc764b7e5613f78f3e7acd30.tar.gz
aur-b702e5c0e7f13103fc764b7e5613f78f3e7acd30.tar.xz
Fix notifications emails going to the right people
In commit f3b4c5c (Refactor the notification script, 2018-05-17), the parameters of the adopt, disown, comaintainer-add and comaintainer-remove notification modules were accidentally pushed around without changing the order in the callers. The notify script now expects to see the userid followed by additional arguments like the pkgbase id. As a result, some random userid with the same id as the pkgbase, got sent a notification regarding some package with the same id as the real user's id. Fix this by changing the order in every invocation of the aforementioned modules. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
-rwxr-xr-xaurweb/git/serve.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/aurweb/git/serve.py b/aurweb/git/serve.py
index 93ff34cf..28827804 100755
--- a/aurweb/git/serve.py
+++ b/aurweb/git/serve.py
@@ -107,7 +107,7 @@ def pkgbase_adopt(pkgbase, user, privileged):
[pkgbase_id, userid])
conn.commit()
- subprocess.Popen((notify_cmd, 'adopt', str(pkgbase_id), str(userid)))
+ subprocess.Popen((notify_cmd, 'adopt', str(userid), str(pkgbase_id)))
conn.close()
@@ -165,8 +165,8 @@ def pkgbase_set_comaintainers(pkgbase, userlist, user, privileged):
cur = conn.execute("INSERT INTO PackageComaintainers " +
"(PackageBaseID, UsersID, Priority) " +
"VALUES (?, ?, ?)", [pkgbase_id, userid, i])
- subprocess.Popen((notify_cmd, 'comaintainer-add', str(pkgbase_id),
- str(userid)))
+ subprocess.Popen((notify_cmd, 'comaintainer-add', str(userid),
+ str(pkgbase_id)))
else:
cur = conn.execute("UPDATE PackageComaintainers " +
"SET Priority = ? " +
@@ -179,7 +179,7 @@ def pkgbase_set_comaintainers(pkgbase, userlist, user, privileged):
"WHERE PackageBaseID = ? AND UsersID = ?",
[pkgbase_id, userid])
subprocess.Popen((notify_cmd, 'comaintainer-remove',
- str(pkgbase_id), str(userid)))
+ str(userid), str(pkgbase_id)))
conn.commit()
conn.close()
@@ -266,7 +266,7 @@ def pkgbase_disown(pkgbase, user, privileged):
if userid == 0:
raise aurweb.exceptions.InvalidUserException(user)
- subprocess.Popen((notify_cmd, 'disown', str(pkgbase_id), str(userid)))
+ subprocess.Popen((notify_cmd, 'disown', str(userid), str(pkgbase_id)))
conn.close()