cvs: pearweb /include pear-rest.php
| From: | Greg Beaver | Date: | Sat, 13 Aug 2005 05:04:15 +0000 |
| Subject: | cvs: pearweb /include pear-rest.php | ||
| Groups: | php.pear.cvs php.pear.core | ||
| Request: | Send a blank email to pear-core+get-3502@lists.php.net to get a copy of this message | ||
cellog Sat Aug 13 01:04:15 2005 EDT
Modified files:
/pearweb/include pear-rest.php
Log:
1) if an empty package is passed to deletePackageREST(), don't
delete everything in sight
2) use System::rm() if all releases are removed, because various
straggler files are present.
http://cvs.php.net/diff.php/pearweb/include/pear-rest.php?r1=1.15&r2=1.16&ty=u
Index: pearweb/include/pear-rest.php
diff -u pearweb/include/pear-rest.php:1.15 pearweb/include/pear-rest.php:1.16
--- pearweb/include/pear-rest.php:1.15 Sat Jul 30 01:28:40 2005
+++ pearweb/include/pear-rest.php Sat Aug 13 01:04:15 2005
@@ -159,6 +159,10 @@
function deletePackageREST($package)
{
+ if (!$package) {
+ // don't delete the entire package/release info
+ return;
+ }
require_once 'System.php';
$pdir = $this->_restdir . DIRECTORY_SEPARATOR . 'p';
$rdir = $this->_restdir . DIRECTORY_SEPARATOR . 'r';
@@ -184,7 +188,7 @@
}
if (!$releases || !count($releases)) {
// remove stragglers if no releases are found
- @unlink($rdir . DIRECTORY_SEPARATOR . strtolower($package));
+ System::rm(array('-r', $rdir . DIRECTORY_SEPARATOR . strtolower($package)));
return;
}
$info = '<?xml version="1.0"?>