pf-tools commit: r638 [ccaillet-guest] - in /branches/0.33-stable: debian/changelog sbin/mk_sourceslist

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

Author: ccaillet-guest
Date: Mon Aug 25 12:36:55 2008
New Revision: 638

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=638
Log:
* Bugfix release
* mk_sourceslist : fix regexp for host and key on structure for retrieving
  distrib from HOSTTYPE which include POPNAME when it is defined

Modified:
    branches/0.33-stable/debian/changelog
    branches/0.33-stable/sbin/mk_sourceslist

Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=638&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Mon Aug 25 12:36:55 2008
@@ -1,3 +1,11 @@
+pf-tools (0.33.3-1) unstable; urgency=low
+
+  * Bugfix release
+  * mk_sourceslist : fix regexp for host and key on structure for retrieving
+    distrib from HOSTTYPE which include POPNAME when it is defined
+
+ -- Christophe Caillet <quadchris at free.fr>  Mon, 25 Aug 2008 14:34:46 +0200
+
 pf-tools (0.33.2-1) iunstable; urgency=low
 
   * Fix different vars like HOSTDIGITS, HOSTTYPE which are extracted from

Modified: branches/0.33-stable/sbin/mk_sourceslist
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/sbin/mk_sourceslist?rev=638&op=diff
==============================================================================
--- branches/0.33-stable/sbin/mk_sourceslist (original)
+++ branches/0.33-stable/sbin/mk_sourceslist Mon Aug 25 12:36:55 2008
@@ -141,7 +141,7 @@
 if ( @ARGV ) { $SECTIONS .= " ".join ( " ", @ARGV ) ; }
 
 my $PF_NET	= Init_lib_net ( Get_source ( $SRC ) ) ;
-$HOST		=~ /^(([^\-]{4})-)?([^\d\-]+)(-([\d]+))?$/ ;
-my $SRV		= $PF_NET->{'SERVERS'}->{'BY_NAME'}->{$3}->{'SRVLIST'}->{$HOST} ;
+$HOST		=~ /^(([^\-]{4})-)?([^\d]+)(([\d]*)([a-z]*))?$/ ;
+my $SRV		= $PF_NET->{'SERVERS'}->{'BY_NAME'}->{$1.$3}->{'SRVLIST'}->{$HOST} ;
 
 Mk_sourceslist ( $SRV, $DST, $TPL, $SECTIONS ) ;