pf-tools commit: r657 [ccaillet-guest] - in /trunk: debian/changelog filters/filter_distrib

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

Author: ccaillet-guest
Date: Wed Oct  8 13:07:38 2008
New Revision: 657

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=657
Log:
Forward port fix r655 from branches/0.33-stable

Modified:
    trunk/debian/changelog
    trunk/filters/filter_distrib

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=657&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Wed Oct  8 13:07:38 2008
@@ -10,8 +10,9 @@
   * Factorizing host properties with Get_Host_Props on Net.pm
   * Forward port r650 for mk_sourceslist from 0.33-stable branch 
   * Avoid a possible warning on mk_sourceslist 
-
- -- Christophe Caillet <quadchris at free.fr>  Wed, 08 Oct 2008 11:57:18 +0200
+  * Forward port fix r655 from branches/0.33-stable
+
+ -- Christophe Caillet <tof at sitadelle.com>  Wed, 08 Oct 2008 15:06:59 +0200
 
 pf-tools (0.33.1-1) unstable; urgency=low
 

Modified: trunk/filters/filter_distrib
URL: http://svn.debian.org/wsvn/pf-tools/trunk/filters/filter_distrib?rev=657&op=diff
==============================================================================
--- trunk/filters/filter_distrib (original)
+++ trunk/filters/filter_distrib Wed Oct  8 13:07:38 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";