Merge lp:~yofel/ubuntu/lucid/samba/lp-623798 into lp:ubuntu/lucid/samba

Proposed by Philip Muškovac on 2010-09-04
Status: Merged
Merge reported by: Thierry Carrez
Merged at revision: not available
Proposed branch: lp:~yofel/ubuntu/lucid/samba/lp-623798
Merge into: lp:ubuntu/lucid/samba
Diff against target: 44 lines (+9/-3)
2 files modified
debian/changelog (+6/-0)
debian/source_samba.py (+3/-3)
To merge this branch: bzr merge lp:~yofel/ubuntu/lucid/samba/lp-623798
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Team 2010-09-04 Pending
Review via email: mp+34611@code.launchpad.net

Description of the change

Fix a typo in the apport hook that causes it to crash when choosing 'others' for the client question:

*** Which clients are failing to connect?

Choices:
  1: Windows
  2: Ubuntu
  3: Both
  4: Other
  C: Cancel
Please choose (1/2/3/4/C):4
hook /usr/share/apport/package-hooks//source_samba.py crashed:
Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/apport/report.py", line 636, in add_hooks_info
    symb['add_info'](self, ui)
  File "/usr/share/apport/package-hooks//source_samba.py", line 95, in add_info
    if repsonse[0] == 3:
NameError: global name 'repsonse' is not defined

Lucid SRU merge

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-04-09 16:50:07 +0000
3+++ debian/changelog 2010-09-04 12:03:45 +0000
4@@ -1,3 +1,9 @@
5+samba (2:3.4.7~dfsg-1ubuntu3.1) lucid-proposed; urgency=low
6+
7+ * Fix typo in apport hook (LP: #623798)
8+
9+ -- Philip Muskovac <yofel@gmx.net> Sat, 04 Sep 2010 13:59:33 +0200
10+
11 samba (2:3.4.7~dfsg-1ubuntu3) lucid; urgency=low
12
13 * debian/winbind.pam-config: Fix potential breakage with stacking of
14
15=== modified file 'debian/source_samba.py'
16--- debian/source_samba.py 2010-02-26 09:10:02 +0000
17+++ debian/source_samba.py 2010-09-04 12:03:45 +0000
18@@ -66,7 +66,7 @@
19 ui.information("As a part of the bug reporting process, you'll be asked as series of questions to help provide a more descriptive bug report. Please answer the following questions to the best of your abilities. Afterwards, a browser will be opened to finish filing this as a bug in the Launchpad bug tracking system.")
20
21 response = ui.choice("How would you best describe your setup?", ["I am running a Windows File Server.", "I am connecting to a Windows File Server."], False)
22-
23+
24 if response == None:
25 raise StopIteration # user has canceled
26 elif response[0] == 0: #its a server
27@@ -77,7 +77,7 @@
28 report['SambaServerRegression'] = "No"
29 if response == True:
30 report['SambaServerRegression'] = 'Yes'
31-
32+
33 response = ui.choice("Which clients are failing to connect?", ["Windows", "Ubuntu", "Both", "Other"], False)
34 if response == None:
35 raise StopIteration # user has canceled
36@@ -87,7 +87,7 @@
37 report['WindowsFailedConnect'] = 'Yes'
38 if response[0] == 2:
39 report['BothFailedConnect'] = 'Yes'
40- if repsonse[0] == 3:
41+ if response[0] == 3:
42 report['OtherFailedconnect'] = 'Yes'
43
44 response = ui.yesno("The contents of your /etc/samba/smb.conf file may help developers diagnose your bug more quickly. However, it may contain sensitive information. Do you want to include it in your bug report?")

Subscribers

People subscribed via source and target branches

to all changes: