pf-tools commit: r810 [ccaillet-guest] - in /branches/next-gen: doc/pf-tools.conf-syntax lib/PFTools/Conf.pm lib/PFTools/VCS.pm sbin/update-config

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

Author: ccaillet-guest
Date: Fri Aug  6 12:23:12 2010
New Revision: 810

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=810
Log:
Small fixes

Modified:
    branches/next-gen/doc/pf-tools.conf-syntax
    branches/next-gen/lib/PFTools/Conf.pm
    branches/next-gen/lib/PFTools/VCS.pm
    branches/next-gen/sbin/update-config

Modified: branches/next-gen/doc/pf-tools.conf-syntax
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/doc/pf-tools.conf-syntax?rev=810&op=diff
==============================================================================
--- branches/next-gen/doc/pf-tools.conf-syntax (original)
+++ branches/next-gen/doc/pf-tools.conf-syntax Fri Aug  6 12:23:12 2010
@@ -20,8 +20,8 @@
 [vcs]
 	type			::= Type of the VCS system. Allowed values are cvs, svn, git, hg. Default is cvs
 	user			::= User for remote access to the VCS. Default is cvsguest
-	method			::= Method use for access to VCS system e.g. pserver for CVS, http or svn+ssh for svn etc.
-	rsh				::= Default rsh use for CVS only. Default is command /usr/sbin/cvs_rsh which is source-tree
+	method			::= Method use for access to VCS system e.g. pserver or rsh for CVS, http or svn+ssh for svn etc. Default is rsh
+	rsh				::= Default rsh use for CVS only and method is rsh. Default is command /usr/sbin/cvs_rsh which is source-tree
 	server			::= VCS system hostname. Definition from pf-tolls configuration is allowed. Default is cvs.private
 	vcsroot			::= ROOT path for the VCS repository. Default is /var/lib/cvs/repository
 	module			::= Module name on VCS for the configuration repository. Default is config

Modified: branches/next-gen/lib/PFTools/Conf.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Conf.pm?rev=810&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Conf.pm (original)
+++ branches/next-gen/lib/PFTools/Conf.pm Fri Aug  6 12:23:12 2010
@@ -320,6 +320,7 @@
 $PF_CONFIG->{'vcs'} = {
 	'type'		=> 'cvs',
 	'user'		=> 'cvsguest',
+	'method'	=> 'rsh'
 	'rsh'		=> '/usr/local/sbin/cvs_rsh',
 	'server'	=> 'cvs.private',
 	'cvsroot'	=> '/var/lib/cvs/repository',

Modified: branches/next-gen/lib/PFTools/VCS.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/VCS.pm?rev=810&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/VCS.pm (original)
+++ branches/next-gen/lib/PFTools/VCS.pm Fri Aug  6 12:23:12 2010
@@ -46,8 +46,8 @@
 				"Ignoring CVS command ".$cvs_cmd." for using branche ".$branche );
 		}
 	}
-	elsif ( $pf_config->{'vcs'}->{'branche'} ) {
-		$branche = $pf_config->{'vcs'}->{'branche'};
+	elsif ( $pf_config->{'vcs'}->{'branch'} ) {
+		$branche = $pf_config->{'vcs'}->{'branch'};
 	}
 	else {
 		$branche = "";
@@ -56,7 +56,7 @@
 	my $ret;
  	my $umask = umask ( $pf_config->{'vcs'}->{'umask'} );
 
-    $ENV{'CVS_RSH'} = $pf_config->{'vcs'}->{'rsh'};
+    $ENV{'CVS_RSH'} = $pf_config->{'vcs'}->{'rsh'} if ( $pf_config->{'vcs'}->{'method'} eq 'rsh' );
 
 	unless ( $cvs_cmd ne "" ) {
 		if ( $hostname =~ /^$pf_config->{'regex'}->{'deploy_hosts'}/ ) {
@@ -68,7 +68,7 @@
 				.$pf_config->{'vcs'}->{'user'}.'@'
 				.$pf_config->{'vcs'}->{'server'} 
 		}
-		$cvs_cmd .= $pf_config->{'vcs'}->{'cvsroot'}."' checkout ";
+		$cvs_cmd .= $pf_config->{'vcs'}->{'vcsroot'}."' checkout ";
 		$cvs_cmd .= ' -r '.$branche if ( $branche ne "" );
 		$cvs_cmd .= $pf_config->{'vcs'}->{'module'};
 	}
@@ -91,10 +91,10 @@
 }
 
 sub VCS_update ($$$;$) {
-	my ( $hostname, $pf_config, $options, $branche ) = @_;
+	my ( $hostname, $pf_config, $options, $branch ) = @_;
 
 	if ( $pf_config->{'vcs'}->{'type'} eq 'cvs' ) {
-		if ( __CVS_update ( $hostname, $pf_config, $options, $branche ) ) {
+		if ( __CVS_update ( $hostname, $pf_config, $options, $branch ) ) {
 			return 0;
 		}
 	}

Modified: branches/next-gen/sbin/update-config
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/sbin/update-config?rev=810&op=diff
==============================================================================
--- branches/next-gen/sbin/update-config (original)
+++ branches/next-gen/sbin/update-config Fri Aug  6 12:23:12 2010
@@ -59,7 +59,7 @@
 	-i --install	: install mode
 	-s --simul	: simulation mode, fake everything
 	-v --verbose	: be more verbose
-	--branche	: update based on a specific VCS branche.
+	--branch	: update based on a specific VCS branche.
     
 # ENDHELP
 }
@@ -72,7 +72,7 @@
 
 GetOptions(
     $options,
-    'branche=s',
+    'branch=s',
     'debug|d',
     'diff|u',
     'help',