We have crazy makefiles here that include each other, pretty crazy.

Take this makefile for example:

http://git.koumbit.net/?p=drupal/makefiles.git;a=blob_plain;f=pressflow/...

When I run it with 2.2, I get this:

aegir@hostmaster:~/makefiles$ drush make pressflow/pressflow-6-core.make foo
pressflow downloaded from http://files.pressflow.org/pressflow-6.20.97.tar.gz.                                                                                                                                                      [ok]
sh: /tmp/drush_make_tmp_1301511047/patches/robots.txt-drupal-6.20.patch: Aucun fichier ou répertoire de ce type
pressflow patched with robots.txt-drupal-6.20.patch.                                                                                                                                                                                [error]
unlink(/tmp/drush_make_tmp_1301511047/patches/robots.txt-drupal-6.20.patch): No such file or directory drush.inc:597                                                                                                                [warning]
sh: /tmp/drush_make_tmp_1301511047/patches/user.module-redmine-2692-5.patch: Aucun fichier ou répertoire de ce type
pressflow patched with user.module-redmine-2692-5.patch.                                                                                                                                                                            [error]
unlink(/tmp/drush_make_tmp_1301511047/patches/user.module-redmine-2692-5.patch): No such file or directory drush.inc:597                                                                                                            [warning]

It seems like the problem is the / in the URL - drush make then expects the file to be untarred in a subdirectory, which is kind of odd if you ask me.

This is a regression, as this works in 2.0-beta11.

CommentFileSizeAuthor
#2 1111050_tolerate_content-disposition.patch518 bytesanarcat

Comments

anarcat’s picture

anarcat commented

If I change the second patch to this:

projects[pressflow][patch][] = http://drupal.org/files/issues/drupal-777116.patch

... and comment out the first one, the makefile succeeds.

There's probably something in that funky url that doesn't get escaped properly or something...

anarcat’s picture

anarcat commented
Status: Active » Needs review
StatusFileSize
new 1111050_tolerate_content-disposition.patch518 bytes

Okay, I tracked the problem to _drush_make_download_file(). I suspect the problem is with the content-disposition header sent by some sites, especially gitweb.

Trivial patch attached, against branch 2.x - let me know if this should be rolled against 3.x.

j0nathan’s picture

j0nathan commented

Subscribing.

EDIT:

Patch in comment #2 resolved my issue with:
drush 4.4
drush make 2.2

Thanks anarcat

anarcat’s picture

anarcat commented
Assigned: Unassigned » anarcat
Status: Needs review » Reviewed & tested by the community

We've been running this in production for a while now...

anarcat’s picture

anarcat commented
Status: Reviewed & tested by the community » Fixed

Pushed as ae3d6b9 in 3.x and e25e480 in 2.x.

Status: Fixed » Closed (fixed)

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