cvs: SVNROOT / run-conversion.php

gwynne Sat Dec 6 16:37:41 2008 UTC Modified files: /SVNROOT run-conversion.php Log: needs to ignore errors when copying repo, missing var in install phase http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.51&r2=1.52&diff_format=u Index: SVNROOT/run-conversion.php diff -u SVNROOT/run-conversion.php:1.51 SVNROOT/run-conversion.php:1.52 --- SVNROOT/run-conversion.php:1.51 Fri Dec 5 05:50:37 2008 +++ SVNROOT/run-conversion.php Sat Dec 6 16:37:41 2008 @@ -7,7 +7,7 @@ // ----------------------------------------------------------------------------------------------------------------------------- // Constants -$version = substr('$Revision: 1.51 $', strlen('$Revision: '), -2); +$version = substr('$Revision: 1.52 $', strlen('$Revision: '), -2); $passes = array( 'processcvs', // Process CVS modules @@ -75,9 +75,9 @@ return $output; } -function cp($source, $dest) +function cp($source, $dest, $ignoreErrors = FALSE) { - run_command("cp -Rpv " . escapeshellarg($source) . ' ' . escapeshellarg($dest) . ' >> ' . escapeshellarg("{$GLOBALS['temp_path']}/cp-output")); + run_command("cp -Rpv " . escapeshellarg($source) . ' ' . escapeshellarg($dest) . ' >> ' . escapeshellarg("{$GLOBALS['temp_path']}/cp-output"), $ignoreErrors); } function mv($source, $dest) @@ -286,7 +286,7 @@ $converter = new CVS2SVNConverter; $cvsPath = "{$GLOBALS['temp_path']}/cvsrepo"; - cp($GLOBALS['options']['cvsroot'], $cvsPath); + cp($GLOBALS['options']['cvsroot'], $cvsPath, TRUE); mv("{$cvsPath}/phpdoc", "{$cvsPath}/doc-base"); mv("{$cvsPath}/doc-base/en", "{$cvsPath}/phpdoc-en"); @@ -476,9 +476,11 @@ { v(1, "Installing administrative files...\n"); + $svnPath = $GLOBALS['options']['svnroot']; + v(2, "Installing post-commit hook...\n"); - unlink("{$svnRoot}/repository/hooks/post-commit"); - symlink("{$svnRoot}/SVNROOT/commit-email.php", "{$svnRoot}/repository/hooks/post-commit"); + @unlink("{$svnPath}/repository/hooks/post-commit"); + symlink("{$svnPath}/SVNROOT/commit-email.php", "{$svnPath}/repository/hooks/post-commit"); v(1, "Done installing global administrative files.\n"); }