fixed #39 commands that need LOCK_SH fail as non-root

diff --git a/pear/PEAR/Registry.php b/pear/PEAR/Registry.php
index 96ac23087f6dfe52a815b03b1d3bbd92440f85e9..c28d2039aea58320d8cfe4e972d5f6784562141a 100644 (file)
--- a/pear/PEAR/Registry.php
+++ b/pear/PEAR/Registry.php
@@ -276,7 +276,7 @@ class PEAR_Registry extends PEAR
             }
             $open_mode = 'w';
             // XXX People reported problems with LOCK_SH and 'w'
-            if ($mode === LOCK_SH) {
+            if ($mode === LOCK_SH || $mode === LOCK_UN) {
                 if (@!is_file($this->lockfile)) {
                     touch($this->lockfile);
                 }

diff --git a/pear/package-PEAR.xml b/pear/package-PEAR.xml
index c5a036956a6cbf6efb4cac59c2deb38de7797827..1f993b00e02cc70369ab3cd10e0d98b46bb0d6cf 100644 (file)
--- a/pear/package-PEAR.xml
+++ b/pear/package-PEAR.xml
@@ -70,6 +70,7 @@ PEAR Installer:
 * Fixed optional dependencies in Dependency.php
 * Fix #25322 - bad md5sum should be fatal error
 * Package uninstall now also removes empty directories
+* Fixed locking problems for reading commands (pear list, pear info)
 
 OS_Guess Class: