[Git][ftp-team/dak][deploy] 3 commits: external signatures: add suite codename to requests

[Ansgar Burchardt <ansgar@debian.org>]

Title: GitLab

Ansgar Burchardt pushed to branch deploy at Debian FTP Team / dak

Commits:

• 9df6470a
  by Ansgar Burchardt at 2018-07-30T02:38:21Z

  external signatures: add suite codename to requests
  

• deba6117
  by Ansgar Burchardt at 2018-07-30T04:07:13Z

  Merge branch 'add-suite-codename-to-external-signature-requests' into 'master'
  
  external signatures: add suite codename to requests
  
  See merge request ftp-team/dak!96

• e13f47d0
  by Ansgar Burchardt at 2018-07-30T04:08:06Z

  Merge branch 'master' into deploy
  

2 changed files:

• daklib/externalsignature.py
• integration-tests/tests/1000-external-signatures

Changes:

daklib/externalsignature.py

---

...	...	@@ -37,9 +37,9 @@ def export_external_signature_requests(session, path):
37	37	tbl_esr = DBConn().tbl_external_signature_requests
38	38	tbl_suite = DBConn().tbl_suite
39	39
40		- query = sql.select([tbl_bin.c.package, tbl_suite.c.suite_name, tbl_arch.c.arch_string, sql.func.max(tbl_bin.c.version)]) \
	40	+ query = sql.select([tbl_bin.c.package, tbl_suite.c.suite_name, tbl_suite.c.codename, tbl_arch.c.arch_string, sql.func.max(tbl_bin.c.version)]) \
41	41	.select_from(tbl_esr.join(tbl_suite).join(tbl_ba, tbl_ba.c.id == tbl_esr.c.association_id).join(tbl_bin).join(tbl_arch)) \
42		- .group_by(tbl_bin.c.package, tbl_suite.c.suite_name, tbl_arch.c.arch_string)
	42	+ .group_by(tbl_bin.c.package, tbl_suite.c.suite_name, tbl_suite.c.codename, tbl_arch.c.arch_string)
43	43	requests = session.execute(query)
44	44
45	45	data = {
...	...	@@ -47,8 +47,9 @@ def export_external_signature_requests(session, path):
47	47	{
48	48	'package': row[0],
49	49	'suite': row[1],
50		- 'architecture': row[2],
51		- 'version': row[3],
	50	+ 'codename': row[2],
	51	+ 'architecture': row[3],
	52	+ 'version': row[4],
52	53	}
53	54	for row in requests],
54	55	}

integration-tests/tests/1000-external-signatures

---

...	...	@@ -55,6 +55,7 @@ expected='
55	55	"packages": [
56	56	{
57	57	"suite": "unstable",
	58	+ "codename": "sid",
58	59	"version": "42.0-1",
59	60	"architecture": "all",
60	61	"package": "linux-image-all-signed-template"

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.