pf-tools commit: r739 [parmelan-guest] - in /branches/0.33-stable: debian/changelog lib/PFTools/Net.pm

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

Author: parmelan-guest
Date: Thu Apr 29 12:25:07 2010
New Revision: 739

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=739
Log:
uncomment the Warn for duplicated network definitions, but don't spit it
out from from filter_* or mk_* commands.

Modified:
    branches/0.33-stable/debian/changelog
    branches/0.33-stable/lib/PFTools/Net.pm

Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=739&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Thu Apr 29 12:25:07 2010
@@ -12,12 +12,13 @@
   * lib/PFTools/Net.pm:
     - detect if we are running in a KVM or QEMU virtual host.
     - when remapping interfaces, do not reuse bonding slaves.
-    - uncomment the Warn for duplicated network definitions.
+    - uncomment the Warn for duplicated network definitions, but don't spit it
+      out from from filter_* or mk_* commands.
     - force serial console when running in a KVM or QEMU virtual host.
   * tools/kvmlaunch:
     - correctly handle bonding / slaves / eth remapping.
 
- -- Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>  Mon, 26 Apr 2010 14:59:08 +0200
+ -- Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>  Thu, 29 Apr 2010 14:24:17 +0200
 
 pf-tools (0.33.19-1) unstable; urgency=low
 

Modified: branches/0.33-stable/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/lib/PFTools/Net.pm?rev=739&op=diff
==============================================================================
--- branches/0.33-stable/lib/PFTools/Net.pm (original)
+++ branches/0.33-stable/lib/PFTools/Net.pm Thu Apr 29 12:25:07 2010
@@ -1469,13 +1469,16 @@
     }
 
     # Not an error, only a warning
+    # Also, don't spit out the warning from filter_* 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'} );
+		. $Z->{'NETWORK'}->{'BY_ADDR'}->{ $S->{'network'} }->{'name'} )
+	    unless $0 =~ m{ \A (?:.*/)? (?:filter|mk)_[^/]+ \z }xms;
     }
 
     # Calcul des adresses, netmasks et broadcasts