[Fai-commit] r4887 - in people/michael/features/setup_harddisks_2/implementation: . lib

[mt at alioth.debian.org]

Author: mt
Date: 2008-05-09 12:48:03 +0000 (Fri, 09 May 2008)
New Revision: 4887

Modified:
   people/michael/features/setup_harddisks_2/implementation/lib/commands.pm
   people/michael/features/setup_harddisks_2/implementation/setup-storage
Log:
extended debug output, added check for empty string


Modified: people/michael/features/setup_harddisks_2/implementation/lib/commands.pm
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/lib/commands.pm	2008-05-09 12:40:39 UTC (rev 4886)
+++ people/michael/features/setup_harddisks_2/implementation/lib/commands.pm	2008-05-09 12:48:03 UTC (rev 4887)
@@ -1010,7 +1010,7 @@
     if ($all_matched) {
       $pushed = -1;
       $i++;
-      push @pre_deps, split(/,/, $FAI::commands{$i}{post});
+      push @pre_deps, split(/,/, $FAI::commands{$i}{post}) if ($FAI::commands{$i}{post} ne "")
       next;
     }
     if (-1 == $pushed) {

Modified: people/michael/features/setup_harddisks_2/implementation/setup-storage
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/setup-storage	2008-05-09 12:40:39 UTC (rev 4886)
+++ people/michael/features/setup_harddisks_2/implementation/setup-storage	2008-05-09 12:48:03 UTC (rev 4887)
@@ -155,7 +155,7 @@
 
 # run all commands
 # debugging only: print the command script
-$FAI::debug and print $FAI::commands{$_}{cmd} . "\n" foreach (sort { $a <=> $b } keys %FAI::commands);
+$FAI::debug and print "$_:" . $FAI::commands{$_}{cmd} . "\n" foreach (sort { $a <=> $b } keys %FAI::commands);
 
 # run the commands (if $FAI::no_dry_run is set)
 # load the modules to support encryption