Fix migration installation path.
authorJan Schneider <jan@horde.org>
Wed, 26 Jan 2011 17:50:22 +0000 (18:50 +0100)
committerJan Schneider <jan@horde.org>
Wed, 26 Jan 2011 17:50:22 +0000 (18:50 +0100)
components/lib/Components/Pear/Package/Filelist/Default.php
components/test/Components/Unit/Components/Pear/Package/Filelist/DefaultTest.php

index 1f96250..5142262 100644 (file)
@@ -109,10 +109,8 @@ class Components_Pear_Package_Filelist_Default
                     );
                     break;
                 case 'migration':
-                    $components = explode('/', $components[1]);
-                    array_splice($components, count($components) - 1, 0, 'migration');
                     $this->_package->addInstallAs(
-                        $file['attribs']['name'], implode('/', $components)
+                        $file['attribs']['name'], 'migration/' . basename($file['attribs']['name'])
                     );
                     break;
                 default:
index 60a112b..26d3471 100644 (file)
@@ -117,7 +117,7 @@ extends PHPUnit_Framework_TestCase
             array('php', 'view.php', 'view.php'),
             array('data', 'data/table.sql', 'table.sql'),
             array('data', 'locale/de.mo', 'locale/de.mo'),
-            array('data', 'migration/Horde/Alarm/1_horde_alarms_table.php', 'Horde/Alarm/migration/1_horde_alarms_table.php'),
+            array('data', 'migration/Horde/Alarm/1_horde_alarms_table.php', 'migration/1_horde_alarms_table.php'),
             array('data', 'somedata', 'somedata'),
         );
     }