]> granicus.if.org Git - php/commitdiff
* move logic to _assertStateDir
authorStig Bakken <ssb@php.net>
Sun, 24 Mar 2002 01:52:38 +0000 (01:52 +0000)
committerStig Bakken <ssb@php.net>
Sun, 24 Mar 2002 01:52:38 +0000 (01:52 +0000)
pear/PEAR/Registry.php

index 9167464cf3dcf6b5aae62af5d9901f1f54e41004..2ae1bd89b8e98cc1bc6299b2d9bb3f223f04ac94 100644 (file)
@@ -109,7 +109,9 @@ class PEAR_Registry extends PEAR
     function _assertStateDir()
     {
         if (!@is_dir($this->statedir)) {
-            return System::mkdir("-p {$this->statedir}");
+            if (!System::mkdir("-p {$this->statedir}")) {
+                return $this->raiseError("could not create directory '{$this->statedir}'");
+            }
         }
         return true;
     }
@@ -210,8 +212,8 @@ class PEAR_Registry extends PEAR
             // XXX does not check type of lock (LOCK_SH/LOCK_EX)
             return true;
         }
-        if (!@$this->_assertStateDir()) {
-            return $this->raiseError("could not create directory '{$this->statedir}'");
+        if (PEAR::isError($err = $this->_assertStateDir())) {
+            return $err;
         }
         $this->lock_fp = @fopen($this->lockfile, 'w');
         if (!is_resource($this->lock_fp)) {