Ensure the horde channel is present when preparing a component for installation.
authorGunnar Wrobel <p@rdus.de>
Mon, 18 Oct 2010 14:58:37 +0000 (16:58 +0200)
committerGunnar Wrobel <p@rdus.de>
Mon, 18 Oct 2010 14:58:37 +0000 (16:58 +0200)
components/lib/Components/Helper/Tree.php
components/lib/Components/Runner/Installer.php

index 32c42a0..f902d14 100644 (file)
@@ -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
index ce3205f..39511d6 100644 (file)
@@ -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'
+        );
     }
 }