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

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

Author: ccaillet-guest
Date: Wed Sep 10 12:33:24 2008
New Revision: 644

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=644
Log:
Backport from trunk (r643) for fixing /etc/pf-tools.conf handling on
Update.pm

Modified:
    branches/0.33-stable/conf/pf-tools.conf
    branches/0.33-stable/debian/changelog
    branches/0.33-stable/lib/PFTools/Update.pm

Modified: branches/0.33-stable/conf/pf-tools.conf
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/conf/pf-tools.conf?rev=644&op=diff
==============================================================================
--- branches/0.33-stable/conf/pf-tools.conf (original)
+++ branches/0.33-stable/conf/pf-tools.conf Wed Sep 10 12:33:24 2008
@@ -1,11 +1,12 @@
-$CVS_USER       = "cvsguest";
-$CVS_RSH        = "/usr/sbin/cvs_rsh";
-$CVS_SERVER     = "cvs.private";
-$CVS_ROOT       = "/var/lib/cvs";
-$CVS_REPOSITORY = $CVS_ROOT . "/repository";
-$CVS_CONFIG     = "config";
+$CVS_USER       	= "cvsguest";
+$CVS_RSH        	= "/usr/sbin/cvs_rsh";
+$CVS_SERVER     	= "cvs.private";
+$CVS_ROOT       	= "/var/lib/cvs";
+$CVS_REPOSITORY 	= $CVS_ROOT . "/repository";
+$CVS_CONFIG     	= "config";
+$DEPLOY_HOST_REGEXP	= '(deploy|cor1-spawn)' ;
 
-if ( $HOSTNAME =~ /^deploy\d+/ ) {
+if ( $PFTools::Conf::SUBST{'HOSTNAME'} =~ /^$DEPLOY_HOST_REGEXP\d+/ ) {
     $CVS_COMMAND =
       "/usr/bin/cvs -R -d '"
       . $CVS_REPOSITORY

Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=644&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Wed Sep 10 12:33:24 2008
@@ -1,3 +1,10 @@
+pf-tools (0.33.5-1) unstable; urgency=low
+
+  * Backport from trunk (r643) for fixing /etc/pf-tools.conf handling on
+    Update.pm
+
+ -- Christophe Caillet <quadchris at free.fr>  Wed, 10 Sep 2008 14:32:00 +0200
+
 pf-tools (0.33.4-1) unstable; urgency=low
 
   * Bugfix release

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=644&op=diff
==============================================================================
--- branches/0.33-stable/lib/PFTools/Update.pm (original)
+++ branches/0.33-stable/lib/PFTools/Update.pm Wed Sep 10 12:33:24 2008
@@ -93,7 +93,7 @@
 my $CVS_ROOT       = "/var/lib/cvs";
 my $CVS_REPOSITORY = $CVS_ROOT . "/repository";
 my $CVS_CONFIG     = "config";
-my $CVS_COMMAND;
+our $CVS_COMMAND;
 my $CVS_BRANCHE;
 
 # End Conf Par Defaut!