From: Gunnar Wrobel <p@rdus.de>
Date: Mon, 18 Oct 2010 14:58:37 +0000 (+0200)
Subject: Ensure the horde channel is present when preparing a component for installation.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f8d5f6068d52a25955302b73cf8ac3a73f167a2c;p=horde.git

Ensure the horde channel is present when preparing a component for installation.
---

diff --git a/components/lib/Components/Helper/Tree.php b/components/lib/Components/Helper/Tree.php
index 32c42a0c4..f902d143d 100644
--- a/components/lib/Components/Helper/Tree.php
+++ b/components/lib/Components/Helper/Tree.php
@@ -150,4 +150,14 @@ class Components_Helper_Tree
             $this
         );
     }
+
+    /**
+     * Return the environment for this tree.
+     *
+     * @return Components_Pear_InstallLocation The installation environment.
+     */
+    public function getEnvironment()
+    {
+        return $this->_environment;
+    }
 }
\ No newline at end of file
diff --git a/components/lib/Components/Runner/Installer.php b/components/lib/Components/Runner/Installer.php
index ce3205fcc..39511d66c 100644
--- a/components/lib/Components/Runner/Installer.php
+++ b/components/lib/Components/Runner/Installer.php
@@ -67,11 +67,13 @@ class Components_Runner_Installer
             $environment = $options['install'];
         }
         $arguments = $this->_config->getArguments();
-        $this->_factory
+        $tree = $this->_factory
             ->createTreeHelper(
                 $environment, dirname(realpath($arguments[0])), $options
-            )->installTreeInEnvironment(
-                realpath($arguments[0]) . DIRECTORY_SEPARATOR . 'package.xml'
             );
+        $tree->getEnvironment()->provideChannel('pear.horde.org');
+        $tree->installTreeInEnvironment(
+            realpath($arguments[0]) . DIRECTORY_SEPARATOR . 'package.xml'
+        );
     }
 }