pf-tools commit: r640 [ccaillet-guest] - in /trunk: debian/changelog sbin/mk_sourceslist

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

Author: ccaillet-guest
Date: Mon Aug 25 12:38:44 2008
New Revision: 640

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=640
Log:
Forward port commit 638 from 0.33-stable branch 

Modified:
    trunk/debian/changelog
    trunk/sbin/mk_sourceslist

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=640&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Mon Aug 25 12:38:44 2008
@@ -2,8 +2,9 @@
 
   * Factorizing code for Get_Active_Filename in Net.pm with Get_PXE_Filename
   * Forward port commit 635 from 0.33-stable branch
-
- -- Christophe Caillet <quadchris at free.fr>  Tue, 19 Aug 2008 11:02:40 +0200
+  * Forward port commit 638 from 0.33-stable branch 
+
+ -- Christophe Caillet <tof at sitadelle.com>  Mon, 25 Aug 2008 14:38:22 +0200
 
 pf-tools (0.33.1-1) unstable; urgency=low
 

Modified: trunk/sbin/mk_sourceslist
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/mk_sourceslist?rev=640&op=diff
==============================================================================
--- trunk/sbin/mk_sourceslist (original)
+++ trunk/sbin/mk_sourceslist Mon Aug 25 12:38:44 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 ) ;