pf-tools/pf-tools: bugfix

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

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/4f108abe7e6a
changeset: 1386:4f108abe7e6a
user:      melkor <melkor at sitadelle.com>
date:      Mon Dec 15 15:17:18 2014 +0100
description:
bugfix

diffstat:

 lib/PFTools/Update/ADDFILE.pm |  8 ++------
 lib/PFTools/Update/Common.pm  |  2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diffs (44 lines):

diff -r c01be7865bfb -r 4f108abe7e6a lib/PFTools/Update/ADDFILE.pm
--- a/lib/PFTools/Update/ADDFILE.pm	Mon Dec 15 15:04:01 2014 +0100
+++ b/lib/PFTools/Update/ADDFILE.pm	Mon Dec 15 15:17:18 2014 +0100
@@ -103,7 +103,6 @@
     my ( $ref_section, $dest, $options, $hash_subst, $global_config ) = @_;
     my ( $source, $tmp );
 
-    my $diff = 0;
     $hash_subst->{'SECTIONNAME'} = $dest;
     $tmp = get_tmp_dest($dest);
 
@@ -191,7 +190,6 @@
     }
 
     if ( compare( $tmp, $dest ) ) {
-        $diff = 1;
         if ( $options->{'verbose'} || $options->{'simul'} ) {
             Log( colored( q{(action needed)}, q{bold red} ) );
         }
@@ -227,10 +225,8 @@
             }
             do_chownmod( $ref_section, $dest, $options );
         }
-        if ($diff) {
-            do_after_change( $ref_section, $options, $hash_subst ) or return;
-            do_on_noaction( $ref_section, $options, $hash_subst ) or return;
-        }
+        do_after_change( $ref_section, $options, $hash_subst ) or return;
+        do_on_noaction( $ref_section, $options, $hash_subst ) or return;
     }
     return 1;
 }
diff -r c01be7865bfb -r 4f108abe7e6a lib/PFTools/Update/Common.pm
--- a/lib/PFTools/Update/Common.pm	Mon Dec 15 15:04:01 2014 +0100
+++ b/lib/PFTools/Update/Common.pm	Mon Dec 15 15:17:18 2014 +0100
@@ -242,7 +242,7 @@
 sub __do_trigger_action {
     my ( $trigger_name, $ref_section, $options, $hash_subst, $depends_trigger ) = @_;
 
-    if ($depends_trigger->{not_if} ne 'ARRAY' or !grep { m{ \A simul \z }xms } @{$depends_trigger->{not_if}}) {
+    if (!$depends_trigger->{not_if} or $depends_trigger->{not_if} ne 'ARRAY' or !grep { m{ \A simul \z }xms } @{$depends_trigger->{not_if}}) {
         push @{$depends_trigger->{not_if}}, 'simul';
     }