It looks like #1490090: Replace direct cp, ls and mv calls with drush_copy_dir, drush_scan_directory and drush_move_dir broke #919224: Allow use of subtrees or individual file from archives instead of the whole archive

While testing #1482888: Support 'subtree' download attribute for libraries it became apparent that drush was no longer moving subtree directives properly.

Looks like we need some additional tests to catch this issue, and/or the existing test needs some refactoring. Fullcalendar may be a good additional test case;

libraries[fullcalendar][download][type] = get
libraries[fullcalendar][download][url] = http://arshaw.com/fullcalendar/downloads/fullcalendar-1.5.3.zip
libraries[fullcalendar][download][sha1] = c7219b1ddd2b11ccdbf83ebd116872affbc45d7a
libraries[fullcalendar][download][subtree] = fullcalendar
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

jhedstrom’s picture

This is starting to feel like whack-a-mole. Definitely want better test coverage of this subtree stuff.

jhedstrom’s picture

FileSize
1.29 KB

This patch highlights the regression. I checked out revision 87d2dad8c, which is where the subtree option was first introduced, and verified that this patched subtree.make file builds properly. Using the latest master it fails. My guess is that #1490090: Replace direct cp, ls and mv calls with drush_copy_dir, drush_scan_directory and drush_move_dir had something to do with the breakage, and the previous subtree.make file wasn't complete enough to catch the problem.

jhedstrom’s picture

Status: Active » Needs review
FileSize
2.03 KB

This patch fixes the issue. The problem was a simple oversight in #1490090: Replace direct cp, ls and mv calls with drush_copy_dir, drush_scan_directory and drush_move_dir which dropped subtree support in one of the 2 places its used.

Going to commit this shortly.

jhedstrom’s picture

Status: Needs review » Fixed

Committed in 24f4bc8. Thanks for finding this issue jgraham!

jgraham’s picture

Awesome tested and looks great thanks jhedstrom :)

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.