[PHP-WEBMASTER] com web/rmtools: preffer package2.xml over package.xml: client/include/PeclExt.php

[Stephen A. Zarkos]

Commit:    52159957a15707492130d4397a8e79b2093d535d
Author:    Anatol Belski <a...@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) {


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php