pf-tools/pf-tools: trim trailing space in parser
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Tue Dec 16 10:00:36 UTC 2014
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/1c4939463098
changeset: 1393:1c4939463098
user: shad
date: Tue Dec 16 11:00:30 2014 +0100
description:
trim trailing space in parser
diffstat:
lib/PFTools/Parser.pm | 2 +-
t/13.conf.cfg1/config-export/COMMON/private-network | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diffs (36 lines):
diff -r 7580c35b3d2b -r 1c4939463098 lib/PFTools/Parser.pm
--- a/lib/PFTools/Parser.pm Mon Dec 15 20:13:55 2014 +0100
+++ b/lib/PFTools/Parser.pm Tue Dec 16 11:00:30 2014 +0100
@@ -30,7 +30,7 @@
our @EXPORT_OK = qw( parse_ini );
-my $trailing_comment_regex = qr{ \s+ [#] .* \z }xms;
+my $trailing_comment_regex = qr{ \s+ (:? [#] .* )? \z }xms;
sub parse_ini {
my ($file) = @_;
diff -r 7580c35b3d2b -r 1c4939463098 t/13.conf.cfg1/config-export/COMMON/private-network
--- a/t/13.conf.cfg1/config-export/COMMON/private-network Mon Dec 15 20:13:55 2014 +0100
+++ b/t/13.conf.cfg1/config-export/COMMON/private-network Tue Dec 16 11:00:30 2014 +0100
@@ -41,7 +41,7 @@
[vip-spawn]
type = server
site = cbv4-pfds
- comment = VIP for spawn services
+ comment = VIP for spawn services
order = 2
number = 1
ipv4.vlan-systeme = 1.254
@@ -51,8 +51,9 @@
alias.cvs = vlan-systeme
alias.nsprivate = vlan-systeme
alias.nscache = vlan-systeme
- alias.mf = vlan-systeme
- alias.vip-deploy = vlan-systeme
+ alias.mf = vlan-systeme # with trailing comment
+ # with trailing space
+ alias.vip-deploy = vlan-systeme
[cbv4-pfds-filer%%]
type = server
More information about the pf-tools-commits
mailing list