pf-tools commit: r635 [ccaillet-guest] - in /branches/0.33-stable: debian/changelog lib/PFTools/Conf.pm

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

Author: ccaillet-guest
Date: Tue Aug 19 08:41:04 2008
New Revision: 635

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=635
Log:
Fix different vars like HOSTDIGITS, HOSTTYPE which are extracted from
HOSTNAME

Modified:
    branches/0.33-stable/debian/changelog
    branches/0.33-stable/lib/PFTools/Conf.pm

Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=635&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Tue Aug 19 08:41:04 2008
@@ -1,3 +1,10 @@
+pf-tools (0.33.2-1) iunstable; urgency=low
+
+  * Fix different vars like HOSTDIGITS, HOSTTYPE which are extracted from
+    HOSTNAME
+
+ -- Christophe Caillet <quadchris at free.fr>  Tue, 19 Aug 2008 10:38:40 +0200
+
 pf-tools (0.33.1-1) unstable; urgency=low
 
   * Bugfix release

Modified: branches/0.33-stable/lib/PFTools/Conf.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/lib/PFTools/Conf.pm?rev=635&op=diff
==============================================================================
--- branches/0.33-stable/lib/PFTools/Conf.pm (original)
+++ branches/0.33-stable/lib/PFTools/Conf.pm Tue Aug 19 08:41:04 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*//;