pf-tools commit: r637 [ccaillet-guest] - in /trunk: debian/changelog lib/PFTools/Conf.pm

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

Author: ccaillet-guest
Date: Tue Aug 19 09:04:22 2008
New Revision: 637

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

Modified:
    trunk/debian/changelog
    trunk/lib/PFTools/Conf.pm

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=637&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Tue Aug 19 09:04:22 2008
@@ -1,8 +1,9 @@
 pf-tools (0.34.0-0WIP) unstable; urgency=low
 
   * Factorizing code for Get_Active_Filename in Net.pm with Get_PXE_Filename
-
- -- Christophe Caillet <quadchris at free.fr>  Mon, 18 Aug 2008 13:48:13 +0200
+  * Forward port commit 635 from 0.33-stable branch
+
+ -- Christophe Caillet <quadchris at free.fr>  Tue, 19 Aug 2008 11:02:40 +0200
 
 pf-tools (0.33.1-1) unstable; urgency=low
 

Modified: trunk/lib/PFTools/Conf.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Conf.pm?rev=637&op=diff
==============================================================================
--- trunk/lib/PFTools/Conf.pm (original)
+++ trunk/lib/PFTools/Conf.pm Tue Aug 19 09:04:22 2008
@@ -88,13 +88,13 @@
 
 chomp( $SUBST{'OS_RELEASE'} = `/bin/uname -r` );
 
-$SUBST{'HOSTNAME'} =~ m/^(([a-z]{3}[\d]{1})-)?([a-z\-]+)([\d]*)([a-z]*)$/;
-
-$SUBST{'HOSTTYPE'}      = $3;
-$SUBST{'HOSTDIGITS'}    = $4;
-$SUBST{'HOSTCLUSTER'}   = $3 . $4;
-$SUBST{'HOSTNODEINDEX'} = $5;
-$SUBST{'POPNAME'}       = $2;
+$SUBST{'HOSTNAME'} =~ m/^((([a-z]{3}[\d]{1})-)?([a-z\-]+))([\d]*)([a-z]*)$/;
+
+$SUBST{'HOSTTYPE'}      = $1;
+$SUBST{'HOSTDIGITS'}    = $5;
+$SUBST{'HOSTCLUSTER'}   = $4 . $5;
+$SUBST{'HOSTNODEINDEX'} = $6;
+$SUBST{'POPNAME'}       = $3;
 
 $SUBST{'HOSTNUM'} = $SUBST{'HOSTDIGITS'};
 $SUBST{'HOSTNUM'} =~ s/^0*//;