com web/rmtools: care also about package2.xml: client/include/PeclExt.php
| From: | Stephen A. Zarkos | Date: | Thu, 12 Sep 2013 11:56:37 +0000 |
| Subject: | com web/rmtools: care also about package2.xml: client/include/PeclExt.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-16700@lists.php.net to get a copy of this message | ||
Commit: 3403fc68d8464c6594162d1eccd345992676b07e
Author: Anatol Belski <ab@php.net> Thu, 12 Sep 2013 13:56:37 +0200
Parents: 01cb0b9e5dfd14869933c7aeabce6cbbbbefb316
Branches: master
Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=3403fc68d8464c6594162d1eccd345992676b07e
Log:
care also about package2.xml
Changed paths:
M client/include/PeclExt.php
Diff:
diff --git a/client/include/PeclExt.php b/client/include/PeclExt.php
index 6dcfd5c..93bebcd 100644
--- a/client/include/PeclExt.php
+++ b/client/include/PeclExt..php
@@ -122,8 +122,14 @@ class PeclExt
$this->tmp_extract_path = realpath($tmp_path . '/' . basename($this->tgz_path,
'.tgz'));
+ $package_xml_path = NULL;
if (file_exists($tmp_path . DIRECTORY_SEPARATOR . 'package.xml')) {
$package_xml_path = $tmp_path . DIRECTORY_SEPARATOR . 'package.xml';
+ } else if (file_exists($tmp_path . DIRECTORY_SEPARATOR . 'package2.xml')) {
+ $package_xml_path = $tmp_path . DIRECTORY_SEPARATOR . 'package2.xml';
+ }
+
+ if ($package_xml_path) {
$this->package_xml = new \SimpleXMLElement($package_xml_path, 0, true);
}