[dak/master] dak/acl.py: include fingerprint of person who granted upload permission
Bug: http://bugs.debian.org/688490
---
dak/acl.py | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dak/acl.py b/dak/acl.py
index 568e21e..e19b269 100644
--- a/dak/acl.py
+++ b/dak/acl.py
@@ -84,14 +84,17 @@ def acl_export_per_source(acl_name):
session = DBConn().session()
acl = session.query(ACL).filter_by(name=acl_name).one()
- query = """
+ query = r"""
SELECT
f.fingerprint,
(SELECT COALESCE(u.name, '') || ' <' || u.uid || '>'
FROM uid u
JOIN fingerprint f2 ON u.id = f2.uid
WHERE f2.id = f.id) AS name,
- STRING_AGG(a.source, ' ' ORDER BY a.source)
+ STRING_AGG(
+ a.source
+ || COALESCE(' (' || (SELECT fingerprint FROM fingerprint WHERE id = a.created_by_id) || ')', ''),
+ E',\n ' ORDER BY a.source)
FROM acl_per_source a
JOIN fingerprint f ON a.fingerprint_id = f.id
LEFT JOIN uid u ON f.uid = u.id
--
1.7.2.5
Reply to: