Merge lp:~zulcss/ubuntu/lucid/eucalyptus/eucalyptus-apport-hook into lp:ubuntu/lucid/eucalyptus

[Chuck Short]

[Chuck Short (zulcss)]

This branch updates the apport hook which provides a bit more information and asks the users question on their UEC setup.

[Dustin Kirkland  (kirkland)]

review: Approve

Unmerged revisions

100. By Chuck Short on 2010-01-20

debian/source_eucalptus.py: Update apport hook with a bit more information.

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-18 09:35:11 +0000
+++ debian/changelog	2010-01-20 19:42:19 +0000
@@ -3,6 +3,9 @@
   * Merge from upstream 1.6.2 tree, minor logging fixes
   * debian/eucalyptus-common.links: fix broken link
 
+  [Chuck Short]
+  * debian/source_eucalptus.py: Update apport hook with a bit more information.
+
  -- Dustin Kirkland <[e-mail]>  Mon, 18 Jan 2010 09:35:11 +1300
 
 eucalyptus (1.6.2~bzr1124-0ubuntu3) lucid; urgency=low
 
=== modified file 'debian/source_eucalyptus.py'
--- debian/source_eucalyptus.py	2010-01-12 00:21:33 +0000
+++ debian/source_eucalyptus.py	2010-01-20 19:42:19 +0000
@@ -2,7 +2,27 @@
 
 from apport.hookutils import *
 
+def installed_packages(report):
+    packages=['vmbuilder', 'euca2ools', 'ec2-api-tools', 'ec2-ami-tools', 'eucalyptus-common', 'eucalyptus-sc', 
+	'eucalyptus-cloud', 'eucalyptus-walrus', 'eucalyptus-java-common', 'eucalyptus-cc',
+	'eucalyptus-nc', 'eucalyptus-gl', 'uec-component-listener']
+
+    version = ''
+    for package in packages:
+	try:
+		vesion = packaging.get_versions(package)
+	except ValueError:
+		version = 'N/A'
+	if version is None:
+		version = 'N/A'
+	versions += '%s %s\n' %(package, version)
+    report['EucalyptusInstalledVersions'] = versions
+
 def add_info(report):
+    # Report on the versions that are installed, including: vmbuilder, ec2-api-tools
+    # ec2-ami-tools, euca2ools, and eucalyptus*
+    installed_packages(report)
+
     attach_file_if_exists(report, '/etc/eucalyptus/eucalyptus.conf', key='eucalyptus.conf')
     attach_file_if_exists(report, '/etc/eucalyptus/eucalyptus.local.conf', key='eucalyptus.local.conf')
     attach_file_if_exists(report, '/etc/eucalyptus/eucalyptus-cc.conf')
@@ -14,3 +34,28 @@
     attach_file_if_exists(report, '/var/log/eucalyptus/cloud-debug.log', key='EucalyptusCloudDebugLog')
     attach_file_if_exists(report, '/var/log/eucalyptus/cloud-output.log', key='EucalyptusCloudOutputLog')
     attach_file_if_exists(report, '/var/log/eucalyptus/httpd-cc_error_log', key='EucalyptusHTTPDErrorLog')
+
+    tags = []
+
+    ui.information("As part of the bug reporting process, you'll be asked a series of questions to help provide a more descriptive bug report. Please answer the following questions to the best of your ability. Afterwards, a browser will be opened to finish filling this as a bug in the Launchpad bug tracking system.")
+
+    response = ui.yesno("Is this issue easily reproducable in the current version of Eucalytptus?")
+    if response == None: #user canceled
+	raise StopIteration
+
+    if response == False:
+	report['EasilyReproduced'] = 'No'
+    elif rsponse == True:
+        report['EasilyReproduced'] = 'Yes'
+        ui.information("Please provide clear steps so that the Ubuntu Developers can reproduce your bug.")
+
+    response = ui.yesno("Are you able to provide more information on how your UEC is setup")
+    if response == None: #use canceled
+	raise StopIteration
+
+    if response == False:
+	report['UECDescSetup'] = 'No'
+	ui.information("It would be benefial to the bug report if you could provide how your UEC is setup.")
+    if response == True:
+	report['UECDescSetup'] = 'Yes'
+	ui.information("Please provide a detailed description of your UEC setup.")