pf-tools commit: r691 [ccaillet-guest] - in /branches/0.33-stable: 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:53:49 2008
New Revision: 691

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=691
Log:
* Minor feature enhancement release
* use strict in Update.pm
* Better regexp backported from trunk r690 and enhanced

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

Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=691&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Tue Dec  2 14:53:49 2008
@@ -1,3 +1,11 @@
+pf-tools (0.33.16-1) unstable; urgency=low
+
+  * Minor feature enhancement release
+  * use strict in Update.pm
+  * Better regexp backported from trunk r690 and enhanced
+
+ -- Christophe Caillet <quadchris at free.fr>  Tue, 02 Dec 2008 15:51:25 +0100
+
 pf-tools (0.33.15-1) unstable; urgency=low
 
   * Backporting tool fix_hosts based on r683 from trunk

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=691&op=diff
==============================================================================
--- branches/0.33-stable/lib/PFTools/Conf.pm (original)
+++ branches/0.33-stable/lib/PFTools/Conf.pm Tue Dec  2 14:53:49 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: branches/0.33-stable/lib/PFTools/Update.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/lib/PFTools/Update.pm?rev=691&op=diff
==============================================================================
--- branches/0.33-stable/lib/PFTools/Update.pm (original)
+++ branches/0.33-stable/lib/PFTools/Update.pm Tue Dec  2 14:53:49 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;