[Git][ftp-team/dak][deploy] 3 commits: control-suite: use `get_suite` to allow using codenames as well

["Ansgar (@ansgar)" <ansgar@debian.org>]

Title: GitLab

Ansgar pushed to branch deploy at Debian FTP Team / dak

Commits:

• 8c86dd5c
  by Ansgar at 2021-08-14T17:56:50+02:00

  control-suite: use `get_suite` to allow using codenames as well
  

• 7e1cfd71
  by Ansgar at 2021-08-15T00:15:04+02:00

  debian-security: fix configuration for stretch-security
  

• baa27f47
  by Ansgar at 2021-08-15T00:15:30+02:00

  Merge branch 'master' into deploy
  

2 changed files:

• config/debian-security/dak.conf
• dak/control_suite.py

Changes:

config/debian-security/dak.conf

---

...	...	@@ -105,8 +105,8 @@ SuiteMappings
105	105	"silent-map oldstable-security oldstable";
106	106	"silent-map oldoldstable-security oldoldstable";
107	107	"silent-map testing-security testing";
108		- "silent-map jessie-security oldoldstable";
109		- "silent-map stretch-security oldstable";
	108	+ "silent-map jessie-security oldoldoldstable";
	109	+ "silent-map stretch-security oldoldstable";
110	110	"silent-map buster-security oldstable";
111	111	"silent-map bullseye-security stable-security";
112	112	"silent-map bullseye stable-security";

dak/control_suite.py

---

...	...	@@ -524,14 +524,14 @@ def main():
524	524
525	525	if action == "list":
526	526	session = DBConn().session()
527		- suite = session.query(Suite).filter_by(suite_name=suite_name).one()
	527	+ suite = get_suite(suite_name, session)
528	528	get_list(suite, session)
529	529	else:
530	530	Logger = daklog.Logger("control-suite")
531	531
532	532	with ArchiveTransaction() as transaction:
533	533	session = transaction.session
534		- suite = session.query(Suite).filter_by(suite_name=suite_name).one()
	534	+ suite = get_suite(suite_name, session)
535	535
536	536	if action == "set" and not suite.allowcsset:
537	537	if force:

—
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.