pf-tools/pf-tools: 2 new changesets

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

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/53db00c4b856
changeset: 1400:53db00c4b856
user:      melkor <melkor at sitadelle.com>
date:      Thu Dec 18 09:28:29 2014 +0100
description:
test for interface tpl

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/74f016f64cda
changeset: 1401:74f016f64cda
user:      melkor <melkor at sitadelle.com>
date:      Thu Dec 18 09:28:40 2014 +0100
description:
bugfix

diffstat:

 lib/PFTools/Update/Common.pm |  10 +++++++++-
 t/21.interfaces.output       |   2 +-
 t/21.interfaces.tpl.t        |   2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 7bf93c471b90 -r 74f016f64cda lib/PFTools/Update/Common.pm
--- a/lib/PFTools/Update/Common.pm	Thu Dec 18 08:41:27 2014 +0100
+++ b/lib/PFTools/Update/Common.pm	Thu Dec 18 09:28:40 2014 +0100
@@ -242,7 +242,15 @@
 sub __do_trigger_action {
     my ( $trigger_name, $ref_section, $options, $hash_subst, $depends_trigger ) = @_;
 
-    if (!$depends_trigger->{not_if} or ref $depends_trigger->{not_if} ne 'ARRAY' or !grep { m{ \A simul \z }xms } @{$depends_trigger->{not_if}}) {
+    if (!$depends_trigger->{not_if}) {
+        push @{$depends_trigger->{not_if}}, 'simul';
+    }
+
+    if (ref $depends_trigger->{not_if} ne 'ARRAY') {
+        croak q{ERROR: 'not_if' must be an array ref};
+    }
+
+    if (!grep { m{ \A simul \z }xms } @{$depends_trigger->{not_if}}) {
         push @{$depends_trigger->{not_if}}, 'simul';
     }
 
diff -r 7bf93c471b90 -r 74f016f64cda t/21.interfaces.output
--- a/t/21.interfaces.output	Thu Dec 18 08:41:27 2014 +0100
+++ b/t/21.interfaces.output	Thu Dec 18 09:28:40 2014 +0100
@@ -43,4 +43,4 @@
     bond_mode active-backup
     bond_miimon 100
     bond_downdelay 200
-    bond_updelay 200
\ No newline at end of file
+    bond_updelay 200
diff -r 7bf93c471b90 -r 74f016f64cda t/21.interfaces.tpl.t
--- a/t/21.interfaces.tpl.t	Thu Dec 18 08:41:27 2014 +0100
+++ b/t/21.interfaces.tpl.t	Thu Dec 18 09:28:40 2014 +0100
@@ -131,7 +131,7 @@
 close $FH_TPL;
 
 my $template = Template->new(
-    TRIM => 1,
+#    TRIM => 1,
 );
 
 my $args_ref = {