pf-tools/pf-tools: bugfix

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

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/bd6ebb6ab290
changeset: 1355:bd6ebb6ab290
user:      melkor <melkor at sitadelle.com>
date:      Fri Dec 05 16:52:24 2014 +0100
description:
bugfix

diffstat:

 lib/PFTools/Update/ADDFILE.pm |  56 ++++++++++++++++++++++--------------------
 1 files changed, 29 insertions(+), 27 deletions(-)

diffs (73 lines):

diff -r 9b98947a41ab -r bd6ebb6ab290 lib/PFTools/Update/ADDFILE.pm
--- a/lib/PFTools/Update/ADDFILE.pm	Fri Dec 05 16:07:58 2014 +0100
+++ b/lib/PFTools/Update/ADDFILE.pm	Fri Dec 05 16:52:24 2014 +0100
@@ -62,31 +62,7 @@
     $tmp = get_tmp_dest($dest);
 
     # Removing trailing space from source
-    $ref_section->{'source'} =~ s{\A\s*}{}xms;
-    $ref_section->{'source'} =~ s{\s*\z}{}xms;
-    if ( $ref_section->{'source'} =~ m{\s}xms ) {
-        $source = get_tmp_dest($dest) . q{.merged};
-        unlink $source;
-        foreach my $splitsource ( split q{ }, $ref_section->{'source'} ) {
-            $splitsource
-                = get_source( $splitsource, $options->{'host'}, $hash_subst );
-            if ( !-f $splitsource ) {
-                carp colored(
-                    qq{ERROR: $splitsource no such file or directory},
-                    q{bold red on_white} );
-                return;
-            }
-            if (deferredlogsystem(
-                    q{cat '} . $splitsource . q{' >> } . $source
-                )
-                )
-            {
-                carp qq{ERROR: Unable to append $splitsource to $source};
-                return;
-            }
-        }
-    }
-    elsif (!$ref_section->{'source'}) {
+    if (!$ref_section->{'source'}) {
         my @search_dirs = (
             'HOSTSITE',
             'HOST',
@@ -112,8 +88,34 @@
         }
     }        
     else {
-        $source = get_source( $ref_section->{'source'},
-            $options->{'host'}, $hash_subst );
+        $ref_section->{'source'} =~ s{\A\s*}{}xms;
+        $ref_section->{'source'} =~ s{\s*\z}{}xms;
+        elsif ( $ref_section->{'source'} =~ m{\s}xms ) {
+            $source = get_tmp_dest($dest) . q{.merged};
+            unlink $source;
+            foreach my $splitsource ( split q{ }, $ref_section->{'source'} ) {
+                $splitsource
+                    = get_source( $splitsource, $options->{'host'}, $hash_subst );
+                if ( !-f $splitsource ) {
+                    carp colored(
+                        qq{ERROR: $splitsource no such file or directory},
+                        q{bold red on_white} );
+                    return;
+                }
+                if (deferredlogsystem(
+                        q{cat '} . $splitsource . q{' >> } . $source
+                    )
+                    )
+                {
+                    carp qq{ERROR: Unable to append $splitsource to $source};
+                    return;
+                }
+            }
+        }
+        else {
+            $source = get_source( $ref_section->{'source'},
+                $options->{'host'}, $hash_subst );
+        }
     }
 
     if ( !-e $source ) {