[Fai-commit] r3870 - people/michael/features/setup_harddisks_2/implementation

[fai-commit at lists.alioth.debian.org]

Author: michael-guest
Date: 2006-09-05 23:09:27 +0000 (Tue, 05 Sep 2006)
New Revision: 3870

Modified:
   people/michael/features/setup_harddisks_2/implementation/Makefile
   people/michael/features/setup_harddisks_2/implementation/shdd2-exec
   people/michael/features/setup_harddisks_2/implementation/shdd2-lib
   people/michael/features/setup_harddisks_2/implementation/shdd2-parser
   people/michael/features/setup_harddisks_2/implementation/shdd2-sizes
Log:
whitespace change only - sorry...


Modified: people/michael/features/setup_harddisks_2/implementation/Makefile
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/Makefile	2006-09-05 23:08:08 UTC (rev 3869)
+++ people/michael/features/setup_harddisks_2/implementation/Makefile	2006-09-05 23:09:27 UTC (rev 3870)
@@ -6,6 +6,7 @@
 	shdd2-fstab \
 	shdd2-init \
 	shdd2-lib \
+	shdd2-parser \
 	shdd2-sizes
 
 tidy:

Modified: people/michael/features/setup_harddisks_2/implementation/shdd2-exec
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-exec	2006-09-05 23:08:08 UTC (rev 3869)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-exec	2006-09-05 23:09:27 UTC (rev 3870)
@@ -51,8 +51,8 @@
 ################################################################################
 $FAI::error_codes = [
   {
-    error        => "parted_1",
-    message      => "Parted produced error. Couldn't remove Partition",
+    error   => "parted_1",
+    message => "Parted produced error. Couldn't remove Partition",
     stderr_regex =>
       ".*Error: Could not stat device rm - No such file or directory.*",
     stdout_regex => "",
@@ -68,8 +68,8 @@
     response     => "die",
   },
   {
-    error        => "parted_3",
-    message      => "Parted produced error. Could not open disk",
+    error   => "parted_3",
+    message => "Parted produced error. Could not open disk",
     stderr_regex =>
       ".*Error: Could not stat device .* - No such file or directory.*",
     stdout_regex => "",

Modified: people/michael/features/setup_harddisks_2/implementation/shdd2-lib
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-lib	2006-09-05 23:08:08 UTC (rev 3869)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-lib	2006-09-05 23:09:27 UTC (rev 3870)
@@ -50,11 +50,8 @@
   # initialize the parameter
   my ($cmd) = @_;
 
-  # split $PATH into its components
-  my @path_list = split( ":", $ENV{"PATH"} );
-
-  # search all components of $PATH
-  foreach my $p (@path_list)
+  # split $PATH into its components, search all of its components
+  foreach my $p ( split( ":", $ENV{"PATH"} ) )
   {
 
     # and test for $cmd being executable

Modified: people/michael/features/setup_harddisks_2/implementation/shdd2-parser
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-parser	2006-09-05 23:08:08 UTC (rev 3869)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-parser	2006-09-05 23:09:27 UTC (rev 3870)
@@ -10,7 +10,7 @@
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # General Public License for more details.
-# 
+#
 # A copy of the GNU General Public License is available as
 # `/usr/share/common-licences/GPL' in the Debian GNU/Linux distribution
 # or on the World Wide Web at http://www.gnu.org/copyleft/gpl.html. You
@@ -189,6 +189,8 @@
   # the type of the partition to be created
   my ($type) = @_;
 
+  # type must either be primary or logical, nothing else may be accepted by the
+  # parser
   ( $type eq "primary" || $type eq "logical" ) or die "INTERNAL PARSER ERROR\n";
 
   # check that a physical device is being configured; logical partitions are
@@ -237,7 +239,7 @@
     # no further checks for the disk label being msdos have to be performed in
     # this branch, it has been ensured above
 
-    # find the index of the new partition, initialise it to the highest current index
+# find the index of the new partition, initialise it to the highest current index
     foreach
       my $part_id ( sort keys %{ $FAI::configs{$FAI::device}{"partitions"} } )
     {
@@ -622,6 +624,7 @@
 ################################################################################
 sub run_parser
 {
+
   # read <STDIN> to a single string (not a list), thus $/ has to be unset
   my $ifs = $/;
   undef $/;

Modified: people/michael/features/setup_harddisks_2/implementation/shdd2-sizes
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-sizes	2006-09-05 23:08:08 UTC (rev 3869)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-sizes	2006-09-05 23:09:27 UTC (rev 3870)
@@ -83,7 +83,8 @@
     # reset NO_DRY_RUN
     $ENV{"NO_DRY_RUN"} = $no_dry_run;
 
-# parted_2 happens when the disk has no disk label. then, parted provides no information about the disk
+    # parted_2 happens when the disk has no disk label. then, parted provides no
+    # information about the disk
     if ( $error eq "parted_2" )
     {