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

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

Author: ccaillet-guest
Date: Tue Dec  2 14:50:06 2008
New Revision: 690

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=690
Log:
* use strict in Update.pm
* Better regexp for HOSTNAME in Conf.pm which permits number into the
  HOSTTYPE part

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

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=690&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Tue Dec  2 14:50:06 2008
@@ -23,8 +23,11 @@
     into private-network for the specified hostname
   * Adding the tool fix_hosts for fixing /etc/hosts file due to dhcp install
     which not modified the target /etc/hosts
-
- -- Christophe Caillet <quadchris at free.fr>  Tue, 25 Nov 2008 12:57:41 +0100
+  * use strict in Update.pm
+  * Better regexp for HOSTNAME in Conf.pm which permits number into the
+    HOSTTYPE part
+
+ -- Christophe Caillet <tof at sitadelle.com>  Tue, 02 Dec 2008 15:48:30 +0100
 
 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=690&op=diff
==============================================================================
--- trunk/lib/PFTools/Conf.pm (original)
+++ trunk/lib/PFTools/Conf.pm Tue Dec  2 14:50:06 2008
@@ -89,7 +89,7 @@
 		}
 	}
 	chomp ( $ref_subst->{'OS_RELEASE'} = `/bin/uname -r` ) ;
-	$ref_subst->{'HOSTNAME'}	=~ m/^((([a-z]{3}[\d]{1})-)?([a-z\-]+))([\d]*)([a-z]*)$/ ;
+	$ref_subst->{'HOSTNAME'}	=~ m/^((([a-z]{3}[\d]{1})-)?([a-z\-0-9]+[a-z]))([\d]*)([a-z]*)$/ ;
 	$ref_subst->{'HOSTTYPE'}	= $1 ;
 	$ref_subst->{'HOSTDIGITS'}	= $5 ;
 	$ref_subst->{'HOSTCLUSTER'}	= $4.$5 ;

Modified: trunk/lib/PFTools/Update.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Update.pm?rev=690&op=diff
==============================================================================
--- trunk/lib/PFTools/Update.pm (original)
+++ trunk/lib/PFTools/Update.pm Tue Dec  2 14:50:06 2008
@@ -23,7 +23,7 @@
 ##  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 ##
 
-# use strict;
+use strict;
 use warnings;
 
 use Exporter;