svn: /pear/pear-core/trunk/PEAR/ Installer.php
[email protected] (Helgi Þormar Þorbjörnsson) Fri, 25 Feb 2011 23:31:16 +0000
| Newsgroups | php.pear.cvs,php.pear.core |
|---|---|
| Message-ID | <[email protected]> |
dufuz Fri, 25 Feb 2011 23:31:16 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=308692
Log:
Remove a debug if statement.
Changed paths:
U pear/pear-core/trunk/PEAR/Installer.php
Modified: pear/pear-core/trunk/PEAR/Installer.php
===================================================================
--- pear/pear-core/trunk/PEAR/Installer.php 2011-02-25 23:25:02 UTC (rev 308691)
+++ pear/pear-core/trunk/PEAR/Installer.php 2011-02-25 23:31:16 UTC (rev 308692)
@@ -767,19 +767,17 @@
* This can happen when a file moves from package A to B in
* an upgrade ala http://pear.php.net/17986
*/
- if ($this->pkginfo->getName() == 'PHPUnit') {
- $info = array(
- 'package' => strtolower($this->pkginfo->getName()),
- 'channel' => strtolower($this->pkginfo->getChannel()),
- );
- $result = $this->_registry->checkFileMap($data[0], $info, '1.1');
- if (is_array($result)) {
- $res = array_diff($result, $info);
- if (!empty($res)) {
- $new = $this->_registry->getPackage($result[1], $result[0]);
- $this->file_operations[$key] = false;
- $this->log(3, "file $data[0] was scheduled for removal from {$this->pkginfo->getName()} but is owned by {$new->getChannel()}/{$new->getName()}, removal has been cancelled.");
- }
+ $info = array(
+ 'package' => strtolower($this->pkginfo->getName()),
+ 'channel' => strtolower($this->pkginfo->getChannel()),
+ );
+ $result = $this->_registry->checkFileMap($data[0], $info, '1.1');
+ if (is_array($result)) {
+ $res = array_diff($result, $info);
+ if (!empty($res)) {
+ $new = $this->_registry->getPackage($result[1], $result[0]);
+ $this->file_operations[$key] = false;
+ $this->log(3, "file $data[0] was scheduled for removal from {$this->pkginfo->getName()} but is owned by {$new->getChannel()}/{$new->getName()}, removal has been cancelled.");
}
}
}