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

[Philip Muškovac]

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

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-09 16:50:07 +0000
+++ debian/changelog	2010-09-04 12:03:45 +0000
@@ -1,3 +1,9 @@
+samba (2:3.4.7~dfsg-1ubuntu3.1) lucid-proposed; urgency=low
+
+  * Fix typo in apport hook (LP: #623798) 
+
+ -- Philip Muskovac <[e-mail]>  Sat, 04 Sep 2010 13:59:33 +0200
+
 samba (2:3.4.7~dfsg-1ubuntu3) lucid; urgency=low
 
   * debian/winbind.pam-config: Fix potential breakage with stacking of

=== modified file 'debian/source_samba.py'
--- debian/source_samba.py	2010-02-26 09:10:02 +0000
+++ debian/source_samba.py	2010-09-04 12:03:45 +0000
@@ -66,7 +66,7 @@
 	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.")
 
 	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)
-	
+
 	if response == None:
 		raise StopIteration # user has canceled
 	elif response[0] == 0: #its a server
@@ -77,7 +77,7 @@
 			report['SambaServerRegression'] = "No"
 		if response == True:
 			report['SambaServerRegression'] = 'Yes'
-	
+
 		response = ui.choice("Which clients are failing to connect?", ["Windows", "Ubuntu", "Both", "Other"], False)
 		if response == None:
 			raise StopIteration # user has canceled
@@ -87,7 +87,7 @@
 			report['WindowsFailedConnect'] = 'Yes'
 		if response[0] == 2:
 			report['BothFailedConnect']  = 'Yes'
-		if repsonse[0] == 3:
+		if response[0] == 3:
 			report['OtherFailedconnect'] = 'Yes'
 
 		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?")