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/3a41d47b0cb9
changeset: 1326:3a41d47b0cb9
user:      shad
date:      Thu Aug 28 14:38:29 2014 +0200
description:
convert correctly hostname whatever the number of % placeholder

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/b5579500e675
changeset: 1327:b5579500e675
user:      shad
date:      Fri Aug 29 14:29:06 2014 +0200
description:
the filter can be followed by something else than a pipe

diffstat:

 lib/PFTools/Compat/Translation.pm |  4 ++--
 tools/Translate_old_config        |  2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 6637ecc40000 -r b5579500e675 lib/PFTools/Compat/Translation.pm
--- a/lib/PFTools/Compat/Translation.pm	Wed Aug 27 16:48:38 2014 +0200
+++ b/lib/PFTools/Compat/Translation.pm	Fri Aug 29 14:29:06 2014 +0200
@@ -61,10 +61,10 @@
 
             # Filter substitution
             if ( $new_conf->{$section}->{$key}
-                =~ m{(filter_(\S+)) (\S+) (\S+) (\S+) ([^|]+)} )
+                =~ m{(filter_(\S+)) (\S+) (\S+) (\S+) ([^|^;]+)} )
             {
                 $new_conf->{$section}->{$key}
-                    =~ s/(filter_(\S+)) (\S+) (\S+) (\S+) ([^|]+)/$1 -i $3 -h $4 -o $5 --sep $6/g;
+                    =~ s/(filter_(\S+)) (\S+) (\S+) (\S+) ([^|^;]+)/$1 -i $3 -h $4 -o $5 --sep $6/g;
             }
             else {
                 $new_conf->{$section}->{$key}
diff -r 6637ecc40000 -r b5579500e675 tools/Translate_old_config
--- a/tools/Translate_old_config	Wed Aug 27 16:48:38 2014 +0200
+++ b/tools/Translate_old_config	Fri Aug 29 14:29:06 2014 +0200
@@ -307,7 +307,7 @@
                 )
             {
                 my $cleanhostname = $hostdef;
-                $cleanhostname =~ s{%%}{}mxs;
+                $cleanhostname =~ s{%+}{}xms;
 
                 # server definition hostfile
                 my $host_output_fh