cvs: pear-core / package-PEAR.xml package2.xml /PEAR/PackageFile/Generator v2.php

cellog Fri May 11 15:33:35 2007 UTC

Modified files:
/pear-core/PEAR/PackageFile/Generator v2.php
/pear-core package-PEAR.xml package2.xml
Log:
* fix Bug #11014: custom tasks with "-" in name cannot be
packaged [cellog]

http://cvs.php.net/viewvc.cgi/pear-c...&diff_format=u
Index: pear-core/PEAR/PackageFile/Generator/v2.php
diff -u pear-core/PEAR/PackageFile/Generator/v2.php:1.35 pear-core/PEAR/PackageFile/Generator/v2.php:1.36
--- pear-core/PEAR/PackageFile/Generator/v2.php:1.35 Sat Mar 25 21:09:08 2006
+++ pear-core/PEAR/PackageFile/Generator/v2.php Fri May 11 15:33:34 2007
@@ -16,7 +16,7 @@
* @author Stephan Schmidt (original XML_Serializer code)
* @copyright 1997-2006 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: v2.php,v 1.35 2006/03/25 21:09:08 cellog Exp $
+ * @version CVS: $Id: v2.php,v 1.36 2007/05/11 15:33:34 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -219,7 +219,9 @@
// run any package-time tasks
$contents = file_get_contents($file);
foreach ($orig as $tag => $raw) {
- $tag = str_replace($this->_packagefile->getTasksNs() . ':', '', $tag);
+ $tag = str_replace(
+ array($this->_packagefile->getTasksNs() . ':', '-'),
+ array('', '_'), $tag);
$task = "PEAR_Task_$tag";
$task = &new $task($this->_packagefile->_config,
$this->_packagefile->_logger,
@@ -871,7 +873,7 @@
// | Authors: Stephan Schmidt <schst@php-tools.net> |
// +----------------------------------------------------------------------+
//
-// $Id: v2.php,v 1.35 2006/03/25 21:09:08 cellog Exp $
+// $Id: v2.php,v 1.36 2007/05/11 15:33:34 cellog Exp $

/**
* error code for invalid chars in XML name
http://cvs.php.net/viewvc.cgi/pear-c...&diff_format=u
Index: pear-core/package-PEAR.xml
diff -u pear-core/package-PEAR.xml:1.457 pear-core/package-PEAR.xml:1.458
--- pear-core/package-PEAR.xml:1.457 Thu May 10 00:32:19 2007
+++ pear-core/package-PEAR.xml Fri May 11 15:33:35 2007
@@ -91,6 +91,8 @@
* fix Bug #10873: pear channel-discover broken - pear temp directories
not writeable [cellog]
* fix Bug #10938: Invalid package.xml creates wrong package [cellog]
+ * fix Bug #11014: custom tasks with &quot;-&quot; in name cannot be
+ packaged [cellog]
* implement Request #10373: if pref_state=stable and installed package=beta,
allow up to latest beta version [tias]
</notes>
http://cvs.php.net/viewvc.cgi/pear-c...&diff_format=u
Index: pear-core/package2.xml
diff -u pear-core/package2.xml:1.355 pear-core/package2.xml:1.356
--- pear-core/package2.xml:1.355 Thu May 10 00:32:19 2007
+++ pear-core/package2.xml Fri May 11 15:33:35 2007
@@ -96,6 +96,8 @@
* fix Bug #10873: pear channel-discover broken - pear temp directories
not writeable [cellog]
* fix Bug #10938: Invalid package.xml creates wrong package [cellog]
+ * fix Bug #11014: custom tasks with &quot;-&quot; in name cannot be
+ packaged [cellog]
* implement Request #10373: if pref_state=stable and installed package=beta,
allow up to latest beta version [tias]
</notes>