[evolvis-commits] r11509: couple more tweaks to aclcheck - cvs checkouts with // instead of / would fail↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 18:17:30 CET 2011


Author: mirabilos
Date: 2011-02-24 18:17:29 +0100 (Thu, 24 Feb 2011)
New Revision: 11509

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/bin/aclcheck.php
Log:
couple more tweaks to aclcheck - cvs checkouts with // instead of / would fail


Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/bin/aclcheck.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/bin/aclcheck.php	2011-02-24 17:17:28 UTC (rev 11508)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/bin/aclcheck.php	2011-02-24 17:17:29 UTC (rev 11509)
@@ -38,7 +38,7 @@
 # Rules
 # 1. Must begin with /cvs/ or /cvsroot/
 # 2. Then must contain 3 - 15 alphanumeric chars or -
-preg_match("/^\/(cvs)(root)*\/([[:alnum:]-]{3,15})$/", $env_cvsroot, $matches);
+preg_match("/^\/\/?(cvs)(root)*\/\/?([[:alnum:]-]{3,15})$/", $env_cvsroot, $matches);
 
 if (count($matches) == 0) {
 	print "Invalid CVS directory\n";
@@ -62,7 +62,7 @@
 } else {
 
 	$snoopy->submit($SubmitUrl,$SubmitVars);
-	if (!empty($snoopy->results)) {
+	if (!empty($snoopy->error) || !empty($snoopy->results)) {
 		print $snoopy->results."\n";
 		exit(1);
 	}



More information about the evolvis-commits mailing list