=== modified file 'debian/changelog'
--- debian/changelog	
+++ debian/changelog	
@@ -1,3 +1,13 @@
+ubiquity (1.0.3) UNRELEASED; urgency=low
+
+  * If install.py exits non-zero, invoke the crash handler with some dummy
+    text (getting the exact reason for the crash is unfortunately
+    difficult). Add text to the crash handler to ask the user to attach
+    /var/log/installer/syslog and /var/log/partman to bug reports so that we
+    can figure out why crashes at this point happen.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 23 May 2006 13:52:20 +0100
+
 ubiquity (1.0.2) dapper; urgency=low
 
   * GTK frontend:

=== modified file 'glade/liveinstaller.glade'
--- glade/liveinstaller.glade	
+++ glade/liveinstaller.glade	
@@ -3435,7 +3435,7 @@
 		<widget class="GtkLabel" id="crash_text_label">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">We're sorry; the installer crashed. Please file a bug report at https://launchpad.net/distros/ubuntu/+source/ubiquity/+filebug and a developer will attend to the problem as soon as possible. To help the developers understand what went wrong, include the following detail in your bug report:</property>
+		  <property name="label" translatable="yes">We're sorry; the installer crashed. Please file a bug report at https://launchpad.net/distros/ubuntu/+source/ubiquity/+filebug and a developer will attend to the problem as soon as possible. To help the developers understand what went wrong, include the following detail in your bug report, and attach the files /var/log/installer/syslog and /var/log/partman:</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>

=== modified file 'ubiquity/frontend/crashdialog.ui'
--- ubiquity/frontend/crashdialog.ui	
+++ ubiquity/frontend/crashdialog.ui	
@@ -112,7 +112,7 @@
                         <cstring>textLabel1</cstring>
                     </property>
                     <property name="text">
-                        <string>and a developer will attend to the problem as soon as possible. To help the developers understand what went wrong, include the following detail in your bug report:</string>
+                        <string>and a developer will attend to the problem as soon as possible. To help the developers understand what went wrong, include the following detail in your bug report, and attach the files /var/log/installer/syslog and /var/log/partman:</string>
                     </property>
                     <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>

=== modified file 'ubiquity/frontend/gtkui.py'
--- ubiquity/frontend/gtkui.py	
+++ ubiquity/frontend/gtkui.py	
@@ -531,10 +531,11 @@
             self.debconf_progress_region(end, 100)
 
         dbfilter = install.Install(self)
-        if dbfilter.run_command(auto_process=True) != 0:
+        ret = dbfilter.run_command(auto_process=True)
+        if ret != 0:
             self.installing = False
-            # TODO cjwatson 2006-02-27: do something nicer than just quitting
-            self.quit()
+            # TODO cjwatson 2006-05-23: figure out why Install crashed
+            raise RuntimeError, "Install failed with exit code %s" % ret
 
         while self.progress_position.depth() != 0:
             self.debconf_progress_stop()

=== modified file 'ubiquity/frontend/kde-ui.py'
--- ubiquity/frontend/kde-ui.py	
+++ ubiquity/frontend/kde-ui.py	
@@ -517,10 +517,11 @@
             self.debconf_progress_region(end, 100)
 
         dbfilter = install.Install(self)
-        if dbfilter.run_command(auto_process=True) != 0:
+        ret = dbfilter.run_command(auto_process=True)
+        if ret != 0:
             self.installing = False
-            # TODO cjwatson 2006-02-27: do something nicer than just quitting
-            self.quit()
+            # TODO cjwatson 2006-05-23: figure out why Install crashed
+            raise RuntimeError, "Install failed with exit code %s" % ret
 
         while self.progress_position.depth() != 0:
             self.debconf_progress_stop()