pf-tools commit: r655 [ccaillet-guest] - in /branches/0.33-stable: debian/changelog filters/filter_distrib

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

Author: ccaillet-guest
Date: Wed Oct  8 13:05:09 2008
New Revision: 655

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=655
Log:
* Bugfix release
* Fix filter_distrib on hosts regexp

Modified:
    branches/0.33-stable/debian/changelog
    branches/0.33-stable/filters/filter_distrib

Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=655&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Wed Oct  8 13:05:09 2008
@@ -1,3 +1,10 @@
+pf-tools (0.33.9-1) unstable; urgency=low
+
+  * Bugfix release
+  * Fix filter_distrib on hosts regexp
+
+ -- Christophe Caillet <quadchris at free.fr>  Wed, 08 Oct 2008 15:03:51 +0200
+
 pf-tools (0.33.8-1) unstable; urgency=low
 
   * Bugfix release

Modified: branches/0.33-stable/filters/filter_distrib
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/filters/filter_distrib?rev=655&op=diff
==============================================================================
--- branches/0.33-stable/filters/filter_distrib (original)
+++ branches/0.33-stable/filters/filter_distrib Wed Oct  8 13:05:09 2008
@@ -59,9 +59,10 @@
 }
 
 my $PF_NET		= Init_lib_net( Get_source("GLOBAL:private-network") ) ;
-$host			=~ /^(([^\-]{4})-)?([^\d\-]+)(-([\d]+))?$/ ;
-my $host_distrib	= $PF_NET->{'SERVERS'}->{'BY_NAME'}->{$3}->{'SRVLIST'}->{$host}->{'distrib'} ;
-my $host_distsrc	= $PF_NET->{'SERVERS'}->{'BY_NAME'}->{$3}->{'SRVLIST'}->{$host}->{'deploymode'} ;
+$host			=~ /^(([^\-]{4})-)?([^\d]+)(([\d]*)([a-z]*))?$/ ;
+my $hosttype		= ( defined $1 ) ? $1.$3 : $3 ;
+my $host_distrib	= $PF_NET->{'SERVERS'}->{'BY_NAME'}->{$hosttype}->{'SRVLIST'}->{$host}->{'distrib'} ;
+my $host_distsrc	= $PF_NET->{'SERVERS'}->{'BY_NAME'}->{$hosttype}->{'SRVLIST'}->{$host}->{'deploymode'} ;
 $host_distsrc		=~ s/^(debian|ubuntu)-installer$/$1/ ;
 
 open SRC, "<$src" or die "open: $src: $!\n";