cellog Sat Sep 25 00:55:02 2004 EDT
Modified files:
/pear-core/PEAR/Downloader Package.php
/pear-core/PEAR Registry.php
/pear-core package-PEAR.xml
Log:
fix the weird upgrade fatal error
fix missing parameter to detectDependencies() in mergeDependencies()
update package.xml
http://cvs.php.net/diff.php/pear-core/PEAR/Downloader/Package.php?r1=1.6&r2=1.7&ty=u
Index: pear-core/PEAR/Downloader/Package.php
diff -u pear-core/PEAR/Downloader/Package.php:1.6
pear-core/PEAR/Downloader/Package.php:1.7
--- pear-core/PEAR/Downloader/Package.php:1.6 Sat Sep 25 00:47:09 2004
+++ pear-core/PEAR/Downloader/Package.php Sat Sep 25 00:55:01 2004
@@ -16,7 +16,7 @@
// | Authors: Gregory Beaver <cellog@xxxxxxx> |
// +----------------------------------------------------------------------+
//
-// $Id: Package.php,v 1.6 2004/09/25 04:47:09 cellog Exp $
+// $Id: Package.php,v 1.7 2004/09/25 04:55:01 cellog Exp $
require_once 'Archive/Tar.php';
require_once 'PEAR/Dependency2.php';
/**
@@ -481,7 +481,7 @@
foreach ($newdeps as $dep) {
$obj = &new PEAR_Downloader_Package($params[$i]->_downloader);
$obj->fromDepURL($dep);
- $obj->detectDependencies();
+ $obj->detectDependencies($params);
$j = &$obj;
$newparams[] = &$j;
}
http://cvs.php.net/diff.php/pear-core/PEAR/Registry.php?r1=1.62&r2=1.63&ty=u
Index: pear-core/PEAR/Registry.php
diff -u pear-core/PEAR/Registry.php:1.62 pear-core/PEAR/Registry.php:1.63
--- pear-core/PEAR/Registry.php:1.62 Fri Sep 24 19:40:51 2004
+++ pear-core/PEAR/Registry.php Sat Sep 25 00:55:01 2004
@@ -18,7 +18,7 @@
// | |
// +----------------------------------------------------------------------+
//
-// $Id: Registry.php,v 1.62 2004/09/24 23:40:51 cellog Exp $
+// $Id: Registry.php,v 1.63 2004/09/25 04:55:01 cellog Exp $
/*
TODO:
@@ -1162,8 +1162,8 @@
return false;
}
if (is_object($info)) {
- $info = $info->getDefaultGenerator();
- $info = $info->toArray();
+ $arr = &$info->getDefaultGenerator();
+ $info = $arr->toArray();
}
$info['_lastmodified'] = time();
$newinfo = $info;
http://cvs.php.net/diff.php/pear-core/package-PEAR.xml?r1=1.117&r2=1.118&ty=u
Index: pear-core/package-PEAR.xml
diff -u pear-core/package-PEAR.xml:1.117 pear-core/package-PEAR.xml:1.118
--- pear-core/package-PEAR.xml:1.117 Sat Sep 11 00:21:11 2004
+++ pear-core/package-PEAR.xml Sat Sep 25 00:55:01 2004
@@ -47,16 +47,28 @@
</maintainer>
</maintainers>
<release>
- <version>1.4.0dev11</version>
- <date>2004-08-16</date>
+ <version>1.4.0dev12</version>
+ <date>2004-09-24</date>
<license>PHP License</license>
<state>devel</state>
<notes>
+Installer Dependency Support:
+
+ * package.xml 2.0 has continued to improve and evolve
+ * Downloader/Package.php is now used to coordinate downloading. Old code
+ has not yet been deleted, as error handling is crappy right now. Uninstall
+ ordering is broken, and needs to be redone.
+ * Pre-download dependency resolution works, mostly.
+ * There is no way to disable dependency resolution at the moment, this will
be done.
+ * Dependency2.php is used by the new PEAR_Downloader_Channel to resolve
dependencies
+ and include downloaded files in the calculations.
+
Installer Channel Support:
- * MAJOR BC break in 1.4.0dev11 - channel.xml format has changed, and as
- a consequence, you must re-install all of the channel.xml
- (delete all the .reg files from the .registry/.channels directory and
- then re-add them using channel-add)
+
+ * MAJOR BC break in 1.4.0dev12 - default channel is named pear.php.net,
+ with alias pear.
+ As a consequence, after upgrade, delete the .registry/pear.reg file,
+ and run "pear list" to re-order the channel registry
* channel XSD is available on pearweb
* add channel.listAll and channel.update to default PEAR protocols
* add ability to "pear channel-update channelname" to
@@ -88,11 +100,6 @@
<dep type="ext" rel="has">pcre</dep>
</deps>
<filelist>
- <file role="data" name="package.dtd"/>
- <file role="data" name="pearchannel.xml"/>
- <file role="data" name="template.spec"/>
- <file role="php" name="PEAR.php"/>
- <file role="php" name="System.php"/>
<dir name="PEAR">
<file role="php" name="Autoloader.php"/>
<file role="php" name="Command.php"/>
@@ -108,21 +115,14 @@
<file role="php" name="Remote.php"/>
<file role="php" name="Mirror.php"/>
</dir>
- <file role="php" name="Common.php"/>
- <file role="php" name="ChannelFile.php"/>
- <file role="php" name="Config.php"/>
- <file role="php" name="Dependency.php"/>
- <file role="php" name="Downloader.php"/>
- <file role="php" name="ErrorStack.php"/>
+ <dir name="Downloader">
+ <file role="php" name="Package.php">
+ <replace from="@PEAR-VER@" to="version" type="package-info"/>
+ </file>
+ </dir>
<dir name="Frontend">
<file role="php" name="CLI.php"/>
</dir>
- <file role="php" name="Builder.php"/>
- <file role="php" name="Installer.php"/>
- <file role="php" name="Packager.php"/>
- <file role="php" name="PackageFile.php">
- <replace from="@PEAR-VER@" to="version" type="package-info"/>
- </file>
<dir name="PackageFile">
<dir name="Generator">
<file role="php" name="v1.php">
@@ -137,6 +137,19 @@
<file role="php" name="v1.php"/>
<file role="php" name="v2.php"/>
</dir>
+ <file role="php" name="Common.php"/>
+ <file role="php" name="ChannelFile.php"/>
+ <file role="php" name="Config.php"/>
+ <file role="php" name="Dependency.php"/>
+ <file role="php" name="Dependency2.php"/>
+ <file role="php" name="Downloader.php"/>
+ <file role="php" name="ErrorStack.php"/>
+ <file role="php" name="Builder.php"/>
+ <file role="php" name="Installer.php"/>
+ <file role="php" name="Packager.php"/>
+ <file role="php" name="PackageFile.php">
+ <replace from="@PEAR-VER@" to="version" type="package-info"/>
+ </file>
<file role="php" name="Registry.php"/>
<file role="php" name="Remote.php"/>
<file role="php" name="RunTest.php"/>
@@ -164,6 +177,11 @@
<replace from="@include_path@" to="php_dir" type="pear-config"/>
</file>
</dir>
+ <file role="data" name="package.dtd"/>
+ <file role="data" name="pearchannel.xml"/>
+ <file role="data" name="template.spec"/>
+ <file role="php" name="PEAR.php"/>
+ <file role="php" name="System.php"/>
</filelist>
</release>
<changelog>
--
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
|
