gwynne Mon Nov 10 02:11:15 2008 UTC
Modified files:
/SVNROOT run-conversion.php
Log:
too many newlines... and silence those propdels\!
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.34&r2=1.35&diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.34 SVNROOT/run-conversion.php:1.35
--- SVNROOT/run-conversion.php:1.34 Mon Nov 10 02:00:00 2008
+++ SVNROOT/run-conversion.php Mon Nov 10 02:11:15 2008
@@ -7,7 +7,7 @@
//
-----------------------------------------------------------------------------------------------------------------------------
// Constants
-$version = substr('$Revision: 1.34 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.35 $', strlen('$Revision: '), -2);
$passes = array(
'processcvs', // Process CVS modules
@@ -528,7 +528,7 @@
function append_prop_line($path, $value)
{
$oldValue = implode("\n", run_command('exec svn propget svn:externals ' .
escapeshellarg($path)));
- $oldValue .= "\n{$value}\n";
+ $oldValue .= "{$value}\n";
run_command('exec svn propset svn:externals ' . escapeshellarg($oldValue)
. ' ' . escapeshellarg($path));
}
@@ -552,16 +552,16 @@
$xml = run_command('exec svn info --xml file:///' .
escapeshellarg($GLOBALS['options']['svnroot'] . '/php-src/php-src/tags/' .
$realTag));
$xml = implode("\n", $xml);
$tagList[$realTag] = strtotime(substr($xml, strpos($xml, '<date>') +
6, strpos($xml, '</date>')));
- run_command('exec svn propdel svn:externals ' . escapeshellarg('tags'
. DIRECTORY_SEPARATOR . $realTag . DIRECTORY_SEPARATOR . 'ext'));
+ run_command('exec svn propdel svn:externals ' . escapeshellarg('tags'
. DIRECTORY_SEPARATOR . $realTag . DIRECTORY_SEPARATOR . 'ext') . '2>&1');
}
foreach ($rawBranchList as $branch) {
$realBranch = substr($branch, 0, -1);
$xml = run_command('exec svn info --xml file:///' .
escapeshellarg($GLOBALS['options']['svnroot'] . '/php-src/php-src/branches/' .
$realBranch));
$xml = implode("\n", $xml);
$branchList[$realBranch] = strtotime(substr($xml, strpos($xml,
'<date>') + 6, strpos($xml, '</date>')));
- run_command('exec svn propdel svn:externals ' .
escapeshellarg('branches' . DIRECTORY_SEPARATOR . $realBranch .
DIRECTORY_SEPARATOR . 'ext'));
+ run_command('exec svn propdel svn:externals ' .
escapeshellarg('branches' . DIRECTORY_SEPARATOR . $realBranch .
DIRECTORY_SEPARATOR . 'ext') . '2>&1');
}
- run_command('exec svn propdel svn:externals ' . escapeshellarg('trunk' .
DIRECTORY_SEPARATOR . 'ext'));
+ run_command('exec svn propdel svn:externals ' . escapeshellarg('trunk' .
DIRECTORY_SEPARATOR . 'ext') . '2>&1');
$links = array('bz2', 'hash', 'oci8', 'pdo', 'pdo_dblib', 'pdo_firebird',
'spl', 'soap', 'sqlite', 'tidy', 'xmlreader', 'xmlwriter', 'filter', 'json',
'ircg', 'pdo_mysql', 'pdo_oci', 'pdo_odbc', 'pdo_pgsql', 'pdo_sqlite',
'simplexml', 'fileinfo');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
