gwynne Sat Nov 8 22:25:48 2008 UTC
Modified files:
/SVNROOT run-conversion.php
Log:
cp needs spaces between parameters... and end() needs a reference
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.21&r2=1.22&diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.21 SVNROOT/run-conversion.php:1.22
--- SVNROOT/run-conversion.php:1.21 Sat Nov 8 20:21:14 2008
+++ SVNROOT/run-conversion.php Sat Nov 8 22:25:48 2008
@@ -6,7 +6,7 @@
//
-----------------------------------------------------------------------------------------------------------------------------
// Constants
-$version = substr('$Revision: 1.21 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.22 $', strlen('$Revision: '), -2);
$passes = array(
'processcvs', // Process CVS modules
@@ -194,15 +194,15 @@
} else {
if ($moduleName == 'php-src') {
// We special-case php-src so we can move TSRM and ZendEngine2
into it easily. Ugh.
- $command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'php-src') .
+ $command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'php-src') . ' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src') .
' > ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
run_command($command);
- $command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'ZendEngine2') .
+ $command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'ZendEngine2') . ' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src/') .
' >> ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
run_command($command);
- $command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR . 'TSRM') .
+ $command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR . 'TSRM') .
' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src/') .
' >> ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
run_command($command);
@@ -310,7 +310,8 @@
error("SVN repository at {$this->svnRepositoryPath} doesn't exist
or isn't writable.\n");
}
- if (trim(end(run_command('svnlook youngest ' .
escapeshellarg($this->svnRepositoryPath)))) != 0) {
+ $output = run_command('svnlook youngest ' .
escapeshellarg($this->svnRepositoryPath));
+ if (trim(end($output)) != 0) {
return; // Repo isn't empty
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
