include file missing on some URLs [#1111050]

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.

Comment	File	Size	Author
#2	1111050_tolerate_content-disposition.patch	518 bytes	anarcat

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Comment #1

anarcat CreditAttribution: anarcat commented 30 March 2011 at 18:56

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...

Comment #2

anarcat CreditAttribution: anarcat commented 30 March 2011 at 19:07

Status:

Active

» Needs review

File	Size
1111050_tolerate_content-disposition.patch	518 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.