From: Stig Bakken <ssb@php.net>
Date: Tue, 26 Nov 2002 01:38:48 +0000 (+0000)
Subject: * a little more "windows robust" when looking for package.xml
X-Git-Tag: RELEASE_1_0b2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=693204265e3970c58932aef21fb4d25e3f1ea1fd;p=php

* a little more "windows robust" when looking for package.xml
---

diff --git a/pear/PEAR/Common.php b/pear/PEAR/Common.php
index eeabe3c0a5..3087e95ca9 100644
--- a/pear/PEAR/Common.php
+++ b/pear/PEAR/Common.php
@@ -696,26 +696,28 @@ class PEAR_Common extends PEAR
     function infoFromTgzFile($file)
     {
         if (!@is_file($file)) {
-            return $this->raiseError("tgz :: could not open file \"$file\"");
+            return $this->raiseError("could not open file \"$file\"");
         }
         $tar = new Archive_Tar($file);
         $content = $tar->listContent();
         if (!is_array($content)) {
-            return $this->raiseError("tgz :: could not get contents of package \"$file\"");
+            return $this->raiseError("could not get contents of package \"$file\"");
         }
         $xml = null;
         foreach ($content as $file) {
             $name = $file['filename'];
             if ($name == 'package.xml') {
                 $xml = $name;
-            } elseif (ereg('^.*/package.xml$', $name, $match)) {
+                break;
+            } elseif (ereg('package.xml$', $name, $match)) {
                 $xml = $match[0];
+                break;
             }
         }
         $tmpdir = System::mkTemp('-d pear');
         $this->addTempFile($tmpdir);
         if (!$xml || !$tar->extractList($xml, $tmpdir)) {
-            return $this->raiseError('tgz :: could not extract the package.xml file');
+            return $this->raiseError('could not extract the package.xml file');
         }
         return $this->infoFromDescriptionFile("$tmpdir/$xml");
     }