ignore failed partition removal if partition table is later initializ…

…ed anyway (bnc#785234)
yast · Oct 16, 2012 · c5ede86 · c5ede86
1 parent 610f474
commit c5ede86
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/libstorage/src/Disk.cc b/libstorage/src/Disk.cc
@@ -2060,7 +2060,10 @@ int Disk::doRemove( Volume* v )
 	    getStorage()->handleHald(true);
 	    if( execCheckFailed( cmd_line.str(), false ) )
 		{
-		ret = DISK_REMOVE_PARTITION_PARTED_FAILED;
+		if( !del_ptable )
+		    ret = DISK_REMOVE_PARTITION_PARTED_FAILED;
+		else
+		    y2war( "suppressing failed removal del_ptable:" << del_ptable );
 		}
 	    ProcParts parts;
 	    if( parts.findDevice(getPartName(p->OrigNr())) )

diff --git a/package/yast2-storage.changes b/package/yast2-storage.changes
@@ -1,6 +1,8 @@
 -------------------------------------------------------------------
 Tue Oct 16 15:00:38 CEST 2012 - fehr@suse.de
 
+- ignore failed partition removal if partition table is later 
+  initialized anyway (bnc#785234)
 - make autoyast able to continue on commit errors (bnc#785234)
 
 -------------------------------------------------------------------