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

[Michael Tautschnig]

Author: mt
Date: 2010-11-04 14:10:24 +0000 (Thu, 04 Nov 2010)
New Revision: 6178

Added:
   branches/experimental/patches/setup-storage_improved-parted-parser-error
Modified:
   branches/experimental/patches/series
Log:
Added patch to included parted output line if parsing parted output fails (the
mysterious Table header not seen yet).


Modified: branches/experimental/patches/series
===================================================================
--- branches/experimental/patches/series	2010-11-03 14:52:52 UTC (rev 6177)
+++ branches/experimental/patches/series	2010-11-04 14:10:24 UTC (rev 6178)
@@ -21,3 +21,4 @@
 setup-storage_disklist-LOGDIR-defaults
 grub-in-target
 setup-storage_pvcreate-old-lvm
+setup-storage_improved-parted-parser-error

Added: branches/experimental/patches/setup-storage_improved-parted-parser-error
===================================================================
--- branches/experimental/patches/setup-storage_improved-parted-parser-error	                        (rev 0)
+++ branches/experimental/patches/setup-storage_improved-parted-parser-error	2010-11-04 14:10:24 UTC (rev 6178)
@@ -0,0 +1,17 @@
+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"};