pf-tools/pf-tools: preseed is in the deployment section

[parmelan-guest at users.alioth.debian.org]

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/89b6e8fa089b
changeset: 1271:89b6e8fa089b
user:      shad
date:      Fri Apr 11 16:51:36 2014 +0200
description:
preseed is in the deployment section

diffstat:

 lib/PFTools/Compat/Translation.pm |  22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diffs (56 lines):

diff -r 73cf29e22abb -r 89b6e8fa089b lib/PFTools/Compat/Translation.pm
--- a/lib/PFTools/Compat/Translation.pm	Fri Apr 11 16:35:25 2014 +0200
+++ b/lib/PFTools/Compat/Translation.pm	Fri Apr 11 16:51:36 2014 +0200
@@ -186,19 +186,28 @@
                     =~ s{ -installer \z}{}xms;
             }
         }
-        elsif ( $key =~ /^arch|distrib$/ ) {
+        elsif ( $key =~ /^preseedtpl|arch|distrib$/ ) {
+
             if ( ref $host_parsed->{$key} eq 'HASH' ) {
                 foreach my $subkey ( keys %{ $host_parsed->{$key} } ) {
+                    my $new_key = $key;
+                    if ( $key eq 'preseedtpl' ) {
+                        $new_key = q{preseed};
+                    }
                     if ( $subkey eq 'default' ) {
-                        $new_host->{'deployment'}->{$key}
+                        $new_host->{'deployment'}->{$new_key}
                             = $host_parsed->{$key}->{$subkey};
                     }
                     else {
-                        $new_host->{'deployment'}->{ $key . '.' . $subkey }
+                        $new_host->{'deployment'}
+                            ->{ $new_key . '.' . $subkey }
                             = $host_parsed->{$key}->{$subkey};
                     }
                 }
             }
+            elsif ( $key eq 'preseedtpl' ) {
+                $new_host->{'deployment'}->{'preseed'} = $host_parsed->{$key};
+            }
             else {
                 $new_host->{'deployment'}->{$key} = $host_parsed->{$key};
             }
@@ -269,9 +278,7 @@
                 $new_host->{'dns'}->{'resolver'} = $host_parsed->{$key};
             }
         }
-        elsif ( $key
-            =~ /^initrd|preseedtpl|pxetemplate|console|(pxe|uml)?filename$/xms
-            )
+        elsif ( $key =~ /^initrd|pxetemplate|console|(pxe|uml)?filename$/xms )
         {
             my $new_key;
             if ( defined $1 ) {
@@ -280,9 +287,6 @@
             elsif ( $key eq 'filename' ) {
                 $new_key = 'pxefilename';
             }
-            elsif ( $key eq 'preseedtpl' ) {
-                $new_key = 'preseed';
-            }
             else {
                 $new_key = $key;
             }