cvs: SVNROOT / run-conversion.php

gwynne Mon Nov 17 20:14:46 2008 UTC Modified files: /SVNROOT run-conversion.php Log: several typos, added newlines where appropriate to generated files http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.45&r2=1.46&diff_format=u Index: SVNROOT/run-conversion.php diff -u SVNROOT/run-conversion.php:1.45 SVNROOT/run-conversion.php:1.46 --- SVNROOT/run-conversion.php:1.45 Mon Nov 17 20:06:03 2008 +++ SVNROOT/run-conversion.php Mon Nov 17 20:14:46 2008 @@ -7,7 +7,7 @@ // ----------------------------------------------------------------------------------------------------------------------------- // Constants -$version = substr('$Revision: 1.45 $', strlen('$Revision: '), -2); +$version = substr('$Revision: 1.46 $', strlen('$Revision: '), -2); $passes = array( 'processcvs', // Process CVS modules @@ -42,7 +42,7 @@ function is_running_pass($pass) { // We always run processcvs so the other passes have info to work with - return $GLOBALS['options']['pass'] === NULL || $GLOBALS['options']['pass'] == $pass || $GLOBALS['options']['pass'] == 'processcvs'; + return $GLOBALS['options']['pass'] === NULL || $GLOBALS['options']['pass'] == $pass || $pass == 'processcvs'; } function scandir_is_meta($value) @@ -363,7 +363,7 @@ private function renameMatchingPaths($base, $match, $replacement, $message) { - $basePath = 'file:///' . escapeshellarg($this->svnRepositoryPath) . '/' escapeshellarg($base); + $basePath = 'file:///' . escapeshellarg($this->svnRepositoryPath) . '/' . escapeshellarg($base); $completeList = $this->executeSVNCommand('ls ' . $basePath); foreach ($completeList as $value) { if (preg_match($match, $value) === 1) { @@ -413,6 +413,7 @@ [/] svnread = r + EOAUTHZ ); } else { @@ -433,6 +434,7 @@ AuthUserFile "{$usersDB}" AuthDigestDomain "/{$this->repositoryName}" </Location> + EOHTTPD ); v(1, "Done installing administrative files.\n"); @@ -521,7 +523,7 @@ $repoList['doc']->addRenameRule(array('mode' => 'mkdir', 'srcPath' => 'en/branches')); $repoList['doc']->addRenameRule(array('mode' => 'move', 'srcPath' => 'phpdoc/trunk/en', 'dstPath' => 'en/trunk')); $repoList['doc']->addRenameRule(array('mode' => 'move', 'srcPath' => 'phpdoc', 'dstPath' => 'doc-base')); - $repoList['doc']->addRenameRule(array('mode' => 'rename', 'basePath' => '', 'match' => '^phpdoc-(.*)$', 'replacement' => "\\1")); + $repoList['doc']->addRenameRule(array('mode' => 'rename', 'basePath' => '', 'match' => '/^phpdoc-(.*)$/', 'replacement' => "\\1")); // Fixup rules for php-src $repoList['src']->addRenameRule(array('mode' => 'move', 'srcPath' => 'pdo-specs/trunk', 'dstPath' => 'pecl/pdo/trunk/specs')); $repoList['src']->addRenameRule(array('mode' => 'delete', 'srcPath' => 'pdo-specs')); @@ -675,14 +677,15 @@ <VirtualHost *:80> ServerName svn.php.net LogLevel debug - CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-svn_log.%Y%m%d 86400" "%t %u ${SVN-ACTION}e" env=SVN-ACTION + CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-svn_log.%Y%m%d 86400" "%t %u %{SVN-ACTION}e" env=SVN-ACTION CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-access_log.%Y%m%d 86400" combined ErrorLog "|/local/bin/rotatelogs /home/svn/logs/svn-error_log.%Y%m%d 86400" + EOHTTPD; foreach ($GLOBALS['repoList'] as $repo) { $confContents .= " Include " . $repo->getHTTPDConfPath() . "\n"; } - $confContents .= "</VirtualHost>"; + $confContents .= "</VirtualHost>\n"; file_put_contents($apacheConf, $confContents); v(1, "Done installing global administrative files.\n"); }