[Fai-commit] r6194 - branches/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2010-11-13 11:41:58 +0000 (Sat, 13 Nov 2010)
New Revision: 6194

Removed:
   branches/experimental/patches/setup-storage_improved-parted-parser-error
Modified:
   branches/experimental/patches/series
Log:
setup-storage_improved-parted-parser-error merged into trunk


Modified: branches/experimental/patches/series
===================================================================
--- branches/experimental/patches/series	2010-11-13 11:39:47 UTC (rev 6193)
+++ branches/experimental/patches/series	2010-11-13 11:41:58 UTC (rev 6194)
@@ -21,5 +21,4 @@
 setup-storage_disklist-LOGDIR-defaults
 grub-in-target
 setup-storage_pvcreate-old-lvm
-setup-storage_improved-parted-parser-error
 setup-storage_hardcode-63-sectors

Deleted: branches/experimental/patches/setup-storage_improved-parted-parser-error
===================================================================
--- branches/experimental/patches/setup-storage_improved-parted-parser-error	2010-11-13 11:39:47 UTC (rev 6193)
+++ branches/experimental/patches/setup-storage_improved-parted-parser-error	2010-11-13 11:41:58 UTC (rev 6194)
@@ -1,17 +0,0 @@
-2010-11-04  Michael Tautschnig  <mt at debian.org>
-
-	* setup-storage/Volumes.pm: Included parted output line if parsing parted
-		output fails (the mysterious Table header not seen yet).
-Index: trunk/lib/setup-storage/Volumes.pm
-===================================================================
---- trunk.orig/lib/setup-storage/Volumes.pm
-+++ trunk/lib/setup-storage/Volumes.pm	
-@@ -251,7 +251,7 @@
-         # we must have seen the header, otherwise probably the format has
-         # changed
-         defined ($cols{"File system"}{"start"})
--          or &FAI::internal_error("Table header not seen yet");
-+          or &FAI::internal_error("Table header not yet seen while reading $line");
- 
-         # the info for the partition number
-         my $num_cols_before = $cols{"Number"}{"start"};