Same fix in make.generate, but implemented using existing API. Hack r…

…emoved from last commit.
drush-ops · Aug 29, 2014 · 95f1832 · 95f1832
1 parent f20ca13
commit 95f1832
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/commands/core/core.drush.inc b/commands/core/core.drush.inc
@@ -527,8 +527,7 @@ function _core_path_aliases($project = '') {
         $projects = array_merge(drush_get_modules(), drush_get_themes());
         foreach(explode(',', $project) as $target) {
           if (array_key_exists($target, $projects)) {
-            $pathname = drush_drupal_major_version() >= 8 ? $projects[$target]->getPathname() : $projects[$target]->filename;
-            $paths['%' . $target] = $drupal_root . '/' . dirname($pathname);
+            $paths['%' . $target] = $drupal_root . '/' . _drush_extension_get_path($projects[$target]);
           }
         }
       }

diff --git a/commands/make/generate.make.inc b/commands/make/generate.make.inc
@@ -117,7 +117,7 @@ function _drush_make_generate_projects($all_extensions, $version_options) {
       $projects[$name]['version'] = preg_replace("/^" . drush_get_drupal_core_compatibility() . "-/", "", $project["version"]);
     }
     foreach ($project['extensions'] as $extension_name) {
-      _drush_make_generate_add_patch_files($projects[$name], dirname($all_extensions[$extension_name]->filename));
+      _drush_make_generate_add_patch_files($projects[$name], _drush_extension_get_path($all_extensions[$extension_name]));
     }
   }