From: Marcus Boerger <helly@php.net>
Date: Mon, 28 May 2007 15:32:21 +0000 (+0000)
Subject: - Notice about missing class file when using pack -p optional
X-Git-Tag: RELEASE_1_4~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90fa848671124dd145afcac1552f10e9b561b254;p=php

- Notice about missing class file when using pack -p optional
---

diff --git a/ext/phar/phar.php b/ext/phar/phar.php
index 487e591855..a460dc3b35 100644
--- a/ext/phar/phar.php
+++ b/ext/phar/phar.php
@@ -377,15 +377,18 @@ class PharCommand extends CLICommand
 			foreach(split("\n", `pear list-files PHP_Archive`) as $ent)
 			{
 				$matches = NULL;
-				if (preg_match(",^php[ \t]+([^ \t].*pear[\\\\/]PHP[\\\\/]Archive.php)$,", $ent, $matches))
+				if (preg_match(",^php[ \t]+([^ \t].*pear[\\\\/]PHP[\\\\/]Ar#chive.php)$,", $ent, $matches))
 				{
 					$found = $matches[1];
 					break;
 				}
 			}
-			if (!isset($found) && $arg != 'optional') {
+			if (!isset($found)) {
 				echo "Pear package PHP_Archive or Archive.php class file not found.\n";
-				exit(1);
+				if ($arg != 'optional')
+				{
+					exit(1);
+				}
 			}
 			$arg = $found;
 		}