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

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

Author: ccaillet-guest
Date: Tue Jun  2 12:53:54 2009
New Revision: 711

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=711
Log:
Avoid potential undefined value with %POPNAME% and %HOSTNODEINDEX%

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=711&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Tue Jun  2 12:53:54 2009
@@ -31,6 +31,7 @@
     integrate those functions into Update.pm
   * Integration of PFTools::Packages into Update.pm (need testing)
   * Avoid ethtool settings in Mk_interfaces for tagged interface(s)
+  * Avoid potential undefined value with %POPNAME% and %HOSTNODEINDEX%
 
   [ Thomas Parmelan ]
   * debian/control
@@ -52,7 +53,7 @@
   * tools/kvmlaunch:
     - new script.
 
- -- Christophe Caillet <tof at sitadelle.com>  Fri, 24 Apr 2009 12:28:35 +0200
+ -- Christophe Caillet <tof at sitadelle.com>  Tue, 02 Jun 2009 14:53:06 +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=711&op=diff
==============================================================================
--- trunk/lib/PFTools/Conf.pm (original)
+++ trunk/lib/PFTools/Conf.pm Tue Jun  2 12:53:54 2009
@@ -116,8 +116,8 @@
 	$ref_subst->{'HOSTTYPE'}	= $1 ;
 	$ref_subst->{'HOSTDIGITS'}	= $5 ;
 	$ref_subst->{'HOSTCLUSTER'}	= $4.$5 ;
-	$ref_subst->{'HOSTNODEINDEX'}	= $6 ;
-	$ref_subst->{'POPNAME'}		= $3 ;
+	$ref_subst->{'HOSTNODEINDEX'}	= $6 || "" ;
+	$ref_subst->{'POPNAME'}		= $3 || "" ;
 	$ref_subst->{'HOSTNUM'}		= $ref_subst->{'HOSTDIGITS'} ;
 	$ref_subst->{'HOSTNUM'}		=~ s/^0*// ;
 	if ( $ref_subst->{'HOSTNUM'} eq "" ) {