com web/rmtools: preffer package2.xml over package.xml: client/include/PeclExt.php
| From: | Stephen A. Zarkos | Date: | Sat, 14 Sep 2013 09:11:37 +0000 |
| Subject: | com web/rmtools: preffer package2.xml over package.xml: client/include/PeclExt.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-16685@lists.php.net to get a copy of this message | ||
Commit: 52159957a15707492130d4397a8e79b2093d535d
Author: Anatol Belski <ab@php.net> Sat, 14 Sep 2013 11:11:37 +0200
Parents: 9644d43a89c2c23daead2850ef823d445c4ad6ff
Branches: master
Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=52159957a15707492130d4397a8e79b2093d535d
Log:
preffer package2.xml over package.xml
Changed paths:
M client/include/PeclExt.php
Diff:
diff --git a/client/include/PeclExt.php b/client/include/PeclExt.php
index def0c16..fc5a550 100644
--- a/client/include/PeclExt.php
+++ b/client/include/PeclExt.php
@@ -199,14 +199,14 @@ class PeclExt
}
$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')) {
+ if (file_exists($tmp_path . DIRECTORY_SEPARATOR . 'package2.xml')) {
$package_xml_path = $tmp_path . DIRECTORY_SEPARATOR . 'package2.xml';
- } else if (file_exists($this->tmp_extract_path . DIRECTORY_SEPARATOR .
'package.xml')) {
- $package_xml_path = $this->tmp_extract_path . DIRECTORY_SEPARATOR . 'package.xml';
+ } else if (file_exists($tmp_path .. DIRECTORY_SEPARATOR . 'package.xml')) {
+ $package_xml_path = $tmp_path . DIRECTORY_SEPARATOR . 'package.xml';
} else if (file_exists($this->tmp_extract_path . DIRECTORY_SEPARATOR .
'package2.xml')) {
$package_xml_path = $this->tmp_extract_path . DIRECTORY_SEPARATOR . 'package2.xml';
+ } else if (file_exists($this->tmp_extract_path . DIRECTORY_SEPARATOR .
'package.xml')) {
+ $package_xml_path = $this->tmp_extract_path . DIRECTORY_SEPARATOR . 'package.xml';
}
if ($package_xml_path) {