1
=== modified file 'debian/changelog'
2
--- debian/changelog	2010-06-01 08:17:20 +0000
3
+++ debian/changelog	2010-06-08 00:23:25 +0000
4
@@ -1,3 +1,10 @@
5
1
samba (2:3.5.3~dfsg-0ubuntu2.1) maverick; urgency=low
6
2
7
3
  * debian/source_samba.py: if /etc/samba/smb.conf is missing, pop up
8
4
    a message for why this is not a bug, and end run.
9
5
10
6
 -- C de-Avillez <hggdh2@ubuntu.com>  Mon, 07 Jun 2010 19:06:51 -0500
11
7
12
1
samba (2:3.5.3~dfsg-0ubuntu2) maverick; urgency=low
8
samba (2:3.5.3~dfsg-0ubuntu2) maverick; urgency=low
13
2
9
14
3
  * debian/control: Drop ctdb build dependency again, it's not in main.
10
  * debian/control: Drop ctdb build dependency again, it's not in main.
15
4
11
16
=== modified file 'debian/source_samba.py'
17
--- debian/source_samba.py	2010-02-26 09:10:02 +0000
18
+++ debian/source_samba.py	2010-06-08 00:23:25 +0000
19
@@ -63,6 +63,11 @@
20
63
63
21
64
64
22
65
	# Interactive report
65
	# Interactive report
23
66
	# start by checking if /etc/smb.conf exists
24
67
	if not os.path.exists ('/etc/samba/smb.conf'):
25
68
		ui.information("The configuration file '/etc/samba/smb.conf' does not exist. This file, and its contents, are critical for the operation of the SAMBA package(s). A common situation for this is:\n  * you removed (but not purged) SAMBA;\n  * later on, you (or somebody) manually deleted '/etc/samba/smb.conf;\n  * you reinstalled SAMBA.\nAs a result, this file is *not* reinstalled. If this is your case, please purge samba-common (e.g., sudo apt-get purge samba-common) and then reinstall SAMBA.\nYou may want to check other sources, like: https://answers.launchpad.net, https://help.ubuntu.com, and http://ubuntuforums.org. Please press any key to end apport's bug collection.")
26
69
		raise StopIteration # we are out
27
70
28
66
	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.")
71
	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.")
29
67
72
30
68
	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)
73
	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)
Status:	Merged
Merge reported by:	Sebastien Bacher
Merged at revision:	not available
Proposed branch:	lp:~hggdh2/ubuntu/maverick/samba/apport-nosmb-conf
Merge into:	lp:ubuntu/maverick/samba
Diff against target:	30 lines (+12/-0) 2 files modified debian/changelog (+7/-0) debian/source_samba.py (+5/-0)
To merge this branch:	bzr merge lp:~hggdh2/ubuntu/maverick/samba/apport-nosmb-conf
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu branches		2010-06-08	Pending
Review via email: mp+27005@code.launchpad.net
1	=== modified file 'debian/changelog'
2	--- debian/changelog 2010-06-01 08:17:20 +0000
3	+++ debian/changelog 2010-06-08 00:23:25 +0000
4	@@ -1,3 +1,10 @@
5			1	samba (2:3.5.3~dfsg-0ubuntu2.1) maverick; urgency=low
6			2
7			3	* debian/source_samba.py: if /etc/samba/smb.conf is missing, pop up
8			4	a message for why this is not a bug, and end run.
9			5
10			6	-- C de-Avillez <hggdh2@ubuntu.com> Mon, 07 Jun 2010 19:06:51 -0500
11			7
12	1	samba (2:3.5.3~dfsg-0ubuntu2) maverick; urgency=low	8	samba (2:3.5.3~dfsg-0ubuntu2) maverick; urgency=low
13	2		9
14	3	* debian/control: Drop ctdb build dependency again, it's not in main.	10	* debian/control: Drop ctdb build dependency again, it's not in main.
15	4		11
16	=== modified file 'debian/source_samba.py'
17	--- debian/source_samba.py 2010-02-26 09:10:02 +0000
18	+++ debian/source_samba.py 2010-06-08 00:23:25 +0000
19	@@ -63,6 +63,11 @@
20	63		63
21	64		64
22	65	# Interactive report	65	# Interactive report
23			66	# start by checking if /etc/smb.conf exists
24			67	if not os.path.exists ('/etc/samba/smb.conf'):
25			68	ui.information("The configuration file '/etc/samba/smb.conf' does not exist. This file, and its contents, are critical for the operation of the SAMBA package(s). A common situation for this is:\n * you removed (but not purged) SAMBA;\n * later on, you (or somebody) manually deleted '/etc/samba/smb.conf;\n * you reinstalled SAMBA.\nAs a result, this file is not reinstalled. If this is your case, please purge samba-common (e.g., sudo apt-get purge samba-common) and then reinstall SAMBA.\nYou may want to check other sources, like: https://answers.launchpad.net, https://help.ubuntu.com, and http://ubuntuforums.org. Please press any key to end apport's bug collection.")
26			69	raise StopIteration # we are out
27			70
28	66	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.")	71	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.")
29	67		72
30	68	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)	73	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)