pf-tools/pf-tools: 2 new changesets
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Thu Nov 4 13:54:46 UTC 2010
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/c8b620892c7d
changeset: 915:c8b620892c7d
user: Thomas Parmelan <tom at sitadelle.com>
date: Thu Nov 04 13:14:12 2010 +0100
description:
Comment out the "Adresse de reseau dupliquee" warning
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/a6cc7e1dbbd4
changeset: 916:a6cc7e1dbbd4
user: ccaillet-guest
date: Thu Nov 04 14:53:42 2010 +0100
description:
Tagging 0.33.21-1
diffstat:
2 files changed, 1 insertion(+), 12 deletions(-)
debian/changelog | 2 +-
lib/PFTools/Net.pm | 11 -----------
diffs (64 lines):
diff -r 22a747f8b10c -r a6cc7e1dbbd4 .hgtags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags Thu Nov 04 14:53:42 2010 +0100
@@ -0,0 +1,1 @@
+c8b620892c7dd95374cd81b205e1c323cbada277 0.33.21-1
diff -r 22a747f8b10c -r a6cc7e1dbbd4 debian/changelog
--- a/debian/changelog Thu Sep 09 18:48:12 2010 +0200
+++ b/debian/changelog Thu Nov 04 14:53:42 2010 +0100
@@ -1,8 +1,6 @@
-pf-tools (0.33.21-0~WIP) unstable; urgency=low
+pf-tools (0.33.21-1) unstable; urgency=low
[ Thomas Parmelan ]
- * WORK IN PROGRESS, DO NOT RELEASE!!
-
* conf/pf-tools.conf:
- $DEPLOY_HOST_REGEXP: match \w{3}\d-spawn instead of "only" cor1-spawn.
@@ -14,8 +12,10 @@
equal 1 else use the old sort method (Olivier Molteni's patch)
* lib/PFTools/Conf.pm
- introducing read_order key (Olivier Molteni's patch)
+ * lib/PFTools/Net.pm
+ - comment out the "Adresse de reseau dupliquee" warning
- -- Christophe Caillet <tof at sitadelle.com> Mon, 06 Sep 2010 11:07:54 +0200
+ -- Christophe Caillet <quadchris at free.fr> Thu, 04 Nov 2010 13:12:48 +0100
pf-tools (0.33.20-1) unstable; urgency=low
diff -r 22a747f8b10c -r a6cc7e1dbbd4 lib/PFTools/Net.pm
--- a/lib/PFTools/Net.pm Thu Sep 09 18:48:12 2010 +0200
+++ b/lib/PFTools/Net.pm Thu Nov 04 14:53:42 2010 +0100
@@ -1465,18 +1465,18 @@
"Masque de reseau manquant pour le reseau " . $net );
}
- # Not an error, only a warning
- # Also, don't spit out the warning from filter_* fix_* or mk_*
- # to avoid clobbering update-config's output
- if ( defined( $Z->{'NETWORK'}->{'BY_ADDR'}->{ $S->{'network'} } ) ) {
- Warn( $ERR_SYNTAX,
- "Adresse de reseau dupliquee ("
- . $S->{'network'}
- . ") pour le reseau "
- . $net . " avec le reseau "
- . $Z->{'NETWORK'}->{'BY_ADDR'}->{ $S->{'network'} }->{'name'} )
- unless $0 =~ m{ \A (?:.*/)? (?:filter|fix|mk)_[^/]+ \z }xms;
- }
+# # Not an error, only a warning
+# # Also, don't spit out the warning from filter_* fix_* or mk_*
+# # to avoid clobbering update-config's output
+# if ( defined( $Z->{'NETWORK'}->{'BY_ADDR'}->{ $S->{'network'} } ) ) {
+# Warn( $ERR_SYNTAX,
+# "Adresse de reseau dupliquee ("
+# . $S->{'network'}
+# . ") pour le reseau "
+# . $net . " avec le reseau "
+# . $Z->{'NETWORK'}->{'BY_ADDR'}->{ $S->{'network'} }->{'name'} )
+# unless $0 =~ m{ \A (?:.*/)? (?:filter|fix|mk)_[^/]+ \z }xms;
+# }
# Calcul des adresses, netmasks et broadcasts
$N->{'name'} = $net;
More information about the pf-tools-commits
mailing list