summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2019-08-03 13:27:22 +0100
committerColin Watson <cjwatson@debian.org>2019-08-03 13:27:22 +0100
commitc0e57836abe9ef24f07c258198283689b51e3613 (patch)
tree9e48e1f555652182762b53c17676f6a264f5078c
parent9e0323ffdc00a48e282b4bd7f0f974665ffe35e1 (diff)
debian/*.apport: Fix flake8 errors
-rw-r--r--debian/changelog1
-rw-r--r--debian/openssh-client.apport5
-rw-r--r--debian/openssh-server.apport5
3 files changed, 7 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 740b5037c..432b40358 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openssh (1:8.0p1-4) UNRELEASED; urgency=medium
4 * debian/*.apport: 4 * debian/*.apport:
5 - Remove #! lines. 5 - Remove #! lines.
6 - Avoid star imports. 6 - Avoid star imports.
7 - Fix flake8 errors.
7 8
8 -- Colin Watson <cjwatson@debian.org> Sat, 03 Aug 2019 12:49:17 +0100 9 -- Colin Watson <cjwatson@debian.org> Sat, 03 Aug 2019 12:49:17 +0100
9 10
diff --git a/debian/openssh-client.apport b/debian/openssh-client.apport
index 8b09bb6c0..e10ca2f0c 100644
--- a/debian/openssh-client.apport
+++ b/debian/openssh-client.apport
@@ -16,6 +16,7 @@ from apport.hookutils import (
16 command_output, 16 command_output,
17) 17)
18 18
19
19def add_info(report, ui): 20def add_info(report, ui):
20 response = ui.yesno("The contents of your /etc/ssh/ssh_config file " 21 response = ui.yesno("The contents of your /etc/ssh/ssh_config file "
21 "may help developers diagnose your bug more " 22 "may help developers diagnose your bug more "
@@ -23,10 +24,10 @@ def add_info(report, ui):
23 "information. Do you want to include it in your " 24 "information. Do you want to include it in your "
24 "bug report?") 25 "bug report?")
25 26
26 if response == None: # user cancelled 27 if response == None: # user cancelled
27 raise StopIteration 28 raise StopIteration
28 29
29 elif response == True: 30 elif response:
30 attach_conffiles(report, 'openssh-client') 31 attach_conffiles(report, 'openssh-client')
31 32
32 attach_related_packages(report, 33 attach_related_packages(report,
diff --git a/debian/openssh-server.apport b/debian/openssh-server.apport
index 58631be2d..aa853b51c 100644
--- a/debian/openssh-server.apport
+++ b/debian/openssh-server.apport
@@ -12,6 +12,7 @@ the full text of the license.
12 12
13from apport.hookutils import root_command_output 13from apport.hookutils import root_command_output
14 14
15
15def add_info(report, ui): 16def add_info(report, ui):
16 response = ui.yesno("The contents of your /etc/ssh/sshd_config file " 17 response = ui.yesno("The contents of your /etc/ssh/sshd_config file "
17 "may help developers diagnose your bug more " 18 "may help developers diagnose your bug more "
@@ -19,8 +20,8 @@ def add_info(report, ui):
19 "information. Do you want to include it in your " 20 "information. Do you want to include it in your "
20 "bug report?") 21 "bug report?")
21 22
22 if response == None: # user cancelled 23 if response == None: # user cancelled
23 raise StopIteration 24 raise StopIteration
24 25
25 elif response == True: 26 elif response:
26 report['SSHDConfig'] = root_command_output(['/usr/sbin/sshd', '-T']) 27 report['SSHDConfig'] = root_command_output(['/usr/sbin/sshd', '-T'])