dufuz Tue, 05 Jul 2011 18:38:56 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312945
Log:
Remove duplication code.
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-07-05 18:31:18 UTC (rev 312944)
+++ pear/pear-core/trunk/PEAR/Installer.php 2011-07-05 18:38:56 UTC (rev 312945)
@@ -1402,23 +1402,24 @@
return $this->raiseError("commit failed", PEAR_INSTALLER_FAILED);
}
+ // See if package already exists
+ $usechannel = $channel;
+ if ($channel == 'pecl.php.net') {
+ $test = $installregistry->packageExists($name, $channel);
+ if (!$test) {
+ $test = $installregistry->packageExists($name, 'pear.php.net');
+ $usechannel = 'pear.php.net';
+ }
+ } else {
+ $test = $installregistry->packageExists($name, $channel);
+ }
+
$ret = false;
$installphase = 'install';
$oldversion = false;
// Register that the package is installed
if (empty($options['upgrade'])) {
// if 'force' is used, replace the info in registry
- $usechannel = $channel;
- if ($channel == 'pecl.php.net') {
- $test = $installregistry->packageExists($name, $channel);
- if (!$test) {
- $test = $installregistry->packageExists($name, 'pear.php.net');
- $usechannel = 'pear.php.net';
- }
- } else {
- $test = $installregistry->packageExists($name, $channel);
- }
-
if (!empty($options['force']) && $test) {
$oldversion = $installregistry->packageInfo($name, 'version', $usechannel);
$installregistry->deletePackage($name, $usechannel);
@@ -1435,17 +1436,6 @@
$this->commitFileTransaction();
}
- $usechannel = $channel;
- if ($channel == 'pecl.php.net') {
- $test = $installregistry->packageExists($name, $channel);
- if (!$test) {
- $test = $installregistry->packageExists($name, 'pear.php.net');
- $usechannel = 'pear.php.net';
- }
- } else {
- $test = $installregistry->packageExists($name, $channel);
- }
-
// new: upgrade installs a package if it isn't installed
if (!$test) {
$ret = $installregistry->addPackage2($pkg);