diff -u gparted-0.1/debian/changelog gparted-0.1/debian/changelog
--- gparted-0.1/debian/changelog
+++ gparted-0.1/debian/changelog
@@ -1,3 +1,11 @@
+gparted (0.1-0ubuntu8) UNRELEASED; urgency=low
+
+  * debian/patches/installer-mode.patch: Only emit "- FORMAT" instructions
+    if setting the partition type succeeded; avoids format instructions
+    being issued if e.g. a preceding resize failed.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 26 May 2006 18:59:31 +0100
+
 gparted (0.1-0ubuntu7) dapper; urgency=low
 
   * debian/patches/upstream-ntfsresize-fixes.patch: Backported from
diff -u gparted-0.1/debian/patches/installer-mode.patch gparted-0.1/debian/patches/installer-mode.patch
--- gparted-0.1/debian/patches/installer-mode.patch
+++ gparted-0.1/debian/patches/installer-mode.patch
@@ -1,6 +1,6 @@
 diff -Nur gparted-0.1/include/Dialog_Progress.h gparted-0.1.new/include/Dialog_Progress.h
 --- gparted-0.1/include/Dialog_Progress.h	2004-11-17 13:00:25.000000000 +0000
-+++ gparted-0.1.new/include/Dialog_Progress.h	2006-05-17 19:26:42.145308587 +0100
++++ gparted-0.1.new/include/Dialog_Progress.h	2006-05-26 18:45:12.037415543 +0100
 @@ -39,16 +39,18 @@
  	Dialog_Progress( int count_operations, Glib::RefPtr<Gtk::TextBuffer> textbuffer );
  	~Dialog_Progress( );
@@ -25,7 +25,7 @@
  	Gtk::ToggleButton tglbtn_details ;
 diff -Nur gparted-0.1/include/GParted_Core.h gparted-0.1.new/include/GParted_Core.h
 --- gparted-0.1/include/GParted_Core.h	2006-01-05 20:08:39.000000000 +0000
-+++ gparted-0.1.new/include/GParted_Core.h	2006-05-17 19:26:42.145308587 +0100
++++ gparted-0.1.new/include/GParted_Core.h	2006-05-26 18:45:12.037415543 +0100
 @@ -41,7 +41,7 @@
  class GParted_Core
  {
@@ -48,7 +48,7 @@
  	void set_device_partitions( Device & device ) ;
 diff -Nur gparted-0.1/include/Win_GParted.h gparted-0.1.new/include/Win_GParted.h
 --- gparted-0.1/include/Win_GParted.h	2006-01-08 15:22:59.000000000 +0000
-+++ gparted-0.1.new/include/Win_GParted.h	2006-05-17 19:26:42.146308587 +0100
++++ gparted-0.1.new/include/Win_GParted.h	2006-05-26 18:45:12.037415543 +0100
 @@ -41,6 +41,7 @@
  #include <gtkmm/statusbar.h>
  #include <gtkmm/liststore.h>
@@ -134,7 +134,7 @@
  } //GParted
 diff -Nur gparted-0.1/src/Dialog_Progress.cc gparted-0.1.new/src/Dialog_Progress.cc
 --- gparted-0.1/src/Dialog_Progress.cc	2005-12-13 21:30:13.000000000 +0000
-+++ gparted-0.1.new/src/Dialog_Progress.cc	2006-05-17 19:26:42.147308587 +0100
++++ gparted-0.1.new/src/Dialog_Progress.cc	2006-05-26 18:45:12.037415543 +0100
 @@ -70,12 +70,23 @@
  	this ->get_action_area( ) ->pack_start( tglbtn_details ) ;
  	this ->add_button( Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL );
@@ -198,7 +198,7 @@
  bool Dialog_Progress::Show_Progress( ) 
 diff -Nur gparted-0.1/src/FileSystem.cc gparted-0.1.new/src/FileSystem.cc
 --- gparted-0.1/src/FileSystem.cc	2005-12-24 23:55:54.000000000 +0000
-+++ gparted-0.1.new/src/FileSystem.cc	2006-05-17 19:26:42.147308587 +0100
++++ gparted-0.1.new/src/FileSystem.cc	2006-05-26 18:45:12.041415543 +0100
 @@ -33,7 +33,9 @@
  	
  	//stderr to stdout
@@ -210,8 +210,8 @@
  	dispatcher ( ) ;
  	
 diff -Nur gparted-0.1/src/GParted_Core.cc gparted-0.1.new/src/GParted_Core.cc
---- gparted-0.1/src/GParted_Core.cc	2006-05-17 19:26:41.172308587 +0100
-+++ gparted-0.1.new/src/GParted_Core.cc	2006-05-17 19:26:42.149308587 +0100
+--- gparted-0.1/src/GParted_Core.cc	2006-05-26 18:45:10.633415543 +0100
++++ gparted-0.1.new/src/GParted_Core.cc	2006-05-26 18:59:22.997415543 +0100
 @@ -5,22 +5,25 @@
  namespace GParted
  {
@@ -255,7 +255,7 @@
  	
  	reiserfs fs_reiserfs;
  	FILESYSTEMS .push_back( fs_reiserfs .get_filesystem_support( ) ) ;
-@@ -542,8 +550,14 @@
+@@ -542,8 +550,19 @@
  		//however in theory, it could also screw some errorhandling.
  		if ( ! p_filesystem )
  			return true ;
@@ -264,29 +264,39 @@
 +                
 +                if ( installer_mode )
 +                {
-+                        std::cout << "- FORMAT " << new_partition .partition << " " << Utils::Get_Filesystem_String( new_partition .filesystem ) << std::endl;
-+                        return set_partition_type( new_partition );
++                        if ( set_partition_type( new_partition ) )
++			{
++				std::cout << "- FORMAT " << new_partition .partition << " " << Utils::Get_Filesystem_String( new_partition .filesystem ) << std::endl;
++				return true ;
++			}
++			else
++				return false ;
 +                }
 +                else
 +                        return set_partition_type( new_partition ) && p_filesystem ->Create( new_partition ) ;
  	}
  	
  	return false ;
-@@ -556,6 +570,11 @@
+@@ -556,6 +575,16 @@
  	
  	set_proper_filesystem( partition .filesystem ) ;
  	
 +        if ( installer_mode )
 +        {
-+                std::cout << "- FORMAT " << partition .partition << " " << Utils::Get_Filesystem_String( partition .filesystem ) << std::endl;
-+                return set_partition_type( partition );
++                if ( set_partition_type( partition ) )
++		{
++			std::cout << "- FORMAT " << partition .partition << " " << Utils::Get_Filesystem_String( partition .filesystem ) << std::endl;
++			return true;
++		}
++		else
++			return false;
 +        }
  	return set_partition_type( partition ) && p_filesystem ->Create( partition ) ;
  }
  
 diff -Nur gparted-0.1/src/Win_GParted.cc gparted-0.1.new/src/Win_GParted.cc
 --- gparted-0.1/src/Win_GParted.cc	2006-01-08 15:23:00.000000000 +0000
-+++ gparted-0.1.new/src/Win_GParted.cc	2006-05-17 19:27:15.446308587 +0100
++++ gparted-0.1.new/src/Win_GParted.cc	2006-05-26 18:45:12.045415543 +0100
 @@ -22,36 +22,55 @@
  #include <cerrno>
  #include <sys/swap.h>
@@ -740,7 +750,7 @@
  } // GParted
 diff -Nur gparted-0.1/src/main.cc gparted-0.1.new/src/main.cc
 --- gparted-0.1/src/main.cc	2005-09-13 15:56:00.000000000 +0100
-+++ gparted-0.1.new/src/main.cc	2006-05-17 19:26:42.154308587 +0100
++++ gparted-0.1.new/src/main.cc	2006-05-26 18:45:12.045415543 +0100
 @@ -20,16 +20,29 @@
  
  int main( int argc, char *argv[ ] )