summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Beaver <cellog@php.net>2003-09-28 05:07:27 +0000
committerGreg Beaver <cellog@php.net>2003-09-28 05:07:27 +0000
commit0c9a167beaa56032dd8840bcd0f3cffe3cae2a81 (patch)
tree215e46c3f612135123eb522ae37badb29524a4bf
parent361c32aa4e0e781ba5b1b2ed4107679d90caf5b9 (diff)
downloadphp-git-0c9a167beaa56032dd8840bcd0f3cffe3cae2a81.tar.gz
fixed #39 commands that need LOCK_SH fail as non-root
-rw-r--r--pear/PEAR/Registry.php2
-rw-r--r--pear/package-PEAR.xml1
2 files changed, 2 insertions, 1 deletions
diff --git a/pear/PEAR/Registry.php b/pear/PEAR/Registry.php
index 96ac23087f..c28d2039ae 100644
--- 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 c5a036956a..1f993b00e0 100644
--- 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: