Author: Kris.Wallsmith
Date: 2010-01-14 00:33:05 +0100 (Thu, 14 Jan 2010)
New Revision: 26597
Modified:
plugins/sfTaskExtraPlugin/branches/1.3/lib/task/subversion/sfSubversionSetPropsTask.class.php
plugins/sfTaskExtraPlugin/branches/1.3/lib/task/subversion/sfTaskExtraSubversionBaseTask.class.php
Log:
[sfTaskExtraPlugin] fixed use of temporary file (closes #8106)
Modified:
plugins/sfTaskExtraPlugin/branches/1.3/lib/task/subversion/sfSubversionSetPropsTask.class.php
===================================================================
---
plugins/sfTaskExtraPlugin/branches/1.3/lib/task/subversion/sfSubversionSetPropsTask.class.php
2010-01-13 23:22:08 UTC (rev 26596)
+++
plugins/sfTaskExtraPlugin/branches/1.3/lib/task/subversion/sfSubversionSetPropsTask.class.php
2010-01-13 23:33:05 UTC (rev 26597)
@@ -35,13 +35,24 @@
This will set the [svn:ignore|COMMENT] property to [*|COMMENT] on the
following directories:
cache/
+ data/sql
+ lib/form/doctrine/base
+ lib/form/doctrine/*/base
+ lib/filter/doctrine/base
+ lib/filter/doctrine/*/base
+ lib/model/doctrine/base
+ lib/model/doctrine/*/base
+ lib/model/om
+ lib/model/map
log/
web/uploads/
+Additionally, the [svn:ignore|COMMENT] property will be set to
[*_dev.php|COMMENT]
+on the [web/|COMMENT] directory.
+
You can specify which svn binary to use with the [--with-svn|COMMENT] option:
[./symfony subversion:set-props --with-svn=/path/to/svn|INFO]
-
EOF;
}
@@ -53,9 +64,7 @@
$finder = sfFinder::type('dir')->name('base');
$this->addIgnore(array_merge(
- $finder->in('lib/form/doctrine'),
- $finder->in('lib/filter/doctrine'),
- $finder->in('lib/model/doctrine'),
+ $finder->in(array('lib/form/doctrine', 'lib/filter/doctrine',
'lib/model/doctrine')),
array('cache', 'data/sql', 'lib/model/om', 'lib/model/map', 'log',
'web/uploads')
));
Modified:
plugins/sfTaskExtraPlugin/branches/1.3/lib/task/subversion/sfTaskExtraSubversionBaseTask.class.php
===================================================================
---
plugins/sfTaskExtraPlugin/branches/1.3/lib/task/subversion/sfTaskExtraSubversionBaseTask.class.php
2010-01-13 23:22:08 UTC (rev 26596)
+++
plugins/sfTaskExtraPlugin/branches/1.3/lib/task/subversion/sfTaskExtraSubversionBaseTask.class.php
2010-01-13 23:33:05 UTC (rev 26597)
@@ -77,9 +77,9 @@
$path = array($path);
}
- $file = sys_get_temp_dir().'sf_'.md5(rand(11111, 99999));
- $this->getFilesystem()->touch($file);
- file_put_contents($file, join(PHP_EOL, $value));
+ $file = tempnam(sys_get_temp_dir(), 'sf_');
+ $this->logSection('file+', $file);
+ file_put_contents($file, implode(PHP_EOL, $value));
foreach ($path as $p)
{
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
