[Git][ftp-team/dak][feature/external-signatures] 3 commits: typo: modules (plural)

[Ansgar Burchardt <ansgar@debian.org>]

Title: GitLab

Ansgar Burchardt pushed to branch feature/external-signatures at Debian FTP Team / dak

Commits:

• 341c5684
  by Ansgar Burchardt at 2018-04-07T20:51:51+02:00

  typo: modules (plural)
  

• 89240178
  by Ansgar Burchardt at 2018-04-07T20:52:10+02:00

  remove unused variable
  

• d574e840
  by Ansgar Burchardt at 2018-04-07T20:53:16+02:00

  acl deny: downgrade removing non-existing permissions to warning
  

2 changed files:

• dak/acl.py
• dak/manage_external_signature_requests.py

Changes:

dak/acl.py

---

...	...	@@ -165,9 +165,8 @@ def acl_deny(acl_name, fingerprint, sources):
165	165
166	166	for source in sources:
167	167	result = session.execute(tbl.delete().where(tbl.c.acl_id == acl_id).where(tbl.c.fingerprint_id == fingerprint_id).where(tbl.c.source == source))
168		- if result.rowcount != 1:
169		- # TODO: Nicer error message?
170		- raise Exception("Tried to deny uploads of '{}', but was not allowed before.".format(source))
	168	+ if result.rowcount < 1:
	169	+ print("W: Tried to deny uploads of '{}', but was not allowed before.".format(source))
171	170
172	171	session.commit()
173	172

dak/manage_external_signature_requests.py

---

...	...	@@ -41,7 +41,7 @@ Logger = None
41	41	def usage (exit_code=0):
42	42	print("""Usage: dak manage-external-signature-requests [OPTIONS]
43	43	Manage external signature requests such as requests to sign EFI binaries or
44		-kernel module.
	44	+kernel modules.
45	45
46	46	-h, --help show this help and exit""")
47	47
...	...	@@ -60,7 +60,7 @@ def main ():
60	60
61	61	Arguments = [('h',"help","Manage-External-Signature-Requests::Options::Help")]
62	62
63		- queue_names = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
	63	+ apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
64	64	Options = cnf.subtree("Manage-External-Signature-Requests::Options")
65	65
66	66	if Options["Help"]:

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