I created a patch file to make a few changes to the Drupal core .htaccess file that are needed for my hosting environment, though drush make seems to not want to patch that file. I have successfully patched modules using patch files located at the same URL, so it doesn't seem to be an issue of the patch file not being accessible by drush make.

My patch file looks roughly like this:

Index: .htaccess
=============================================================================
--- .htaccess (revision 2)
+++ .htaccess (working copy)
@@ -11,7 +11,8 @@
 Options -Indexes
 
 # Follow symbolic links in this directory.
-Options +FollowSymLinks
+# This is disabled
+# Options +FollowSymLinks
 
 # Make Drupal handle any 404 errors.
 ErrorDocument 404 /index.php
@@ -56,6 +57,8 @@
   php_value mbstring.http_input             pass
   php_value mbstring.http_output            pass
   php_value mbstring.encoding_translation   0
+  # Increased default memory limit
+  php_value memory_limit                    48M
 </IfModule>
 
 # Requires mod_expires to be enabled.

and my makefile looks roughly like this (hostname of patch location removed, sorry):

core = 6.x

projects[drupal][patch][] = "http://path/to/drupal_patches/drupal_htaccess.patch"

Appreciate any help.

Thanks,
Paul

Comments

pfg’s picture

Issue tags: +patch, +.htaccess
dmitrig01’s picture

Try patching core with a different patch. Is it that patching core doesn't work at all? Also, please post the output of running with --debug.

pfg’s picture

Running with --debug showed nothing related to the .htaccess patch. It looks like it was ignored.

I will try patching core with a different patch tomorrow if I get a chance.

Is there any documentation yet on the flags (such as --debug) for drush make?

wik’s picture

Same problem here:

projects[drupal][version] = "6.14"
projects[drupal][patch][] = "http://drupal.org/files/issues/htaccess-choose_php5.patch"

Patches works fine for modules, but seems ignored for drupal core.

Thanks.

dmitrig01’s picture

Status: Active » Fixed

Fixed in latest dev release.

Status: Fixed » Closed (fixed)

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

grendzy’s picture

Version: 6.x-2.0-beta2 » 6.x-2.0-beta6
Status: Closed (fixed) » Active

I'm not sure if this is by design, but patches aren't applied if you use the recursive feature of make, such as:

##### "outer" makefile
core = 6.x
projects[] = drupal
projects[foo][type] = "profile"
projects[foo][download][type] = "svn"
projects[foo][download][url] = "https://svn.foo.com/svn/foo_tools/drupal_profiles/foo/trunk"


##### "inner" makefile within install profile
core = 6.x
; gzip common text formats.  http://drupal.org/node/101227
projects[drupal][patch][] = http://drupal.org/files/issues/mod_deflate.patch

projects[] = admin_menu
.
.
.
dmitrig01’s picture

Status: Active » Postponed

Yeah, there's no way we can fix that without a lot of work ATM. Maybe in the future

pcambra’s picture

suscribe

dmitrig01’s picture

Title: Cannot apply a patch to Drupal core .htaccess file » Cannot apply a patch up the recursion tree
dmitrig01’s picture

Category: bug » task
pearcec’s picture

Category: task » bug
Status: Postponed » Active

What needs to happen to make this work. Please explain and I will try to work up a solution. This is a complete show stopper.

dmitrig01’s picture

Category: bug » feature
Status: Active » Postponed

This is not a bug, this is a request for a feature (I had it set to a task as in, "this will get done eventually" as opposed to "here is my dream vision and I am requesting this as a feature"). This requires a major rewrite of the project aspect of drush make, separating the download functionality from the moving functionality: first, all the files need to be downloaded, then they need to be recursed through until recursion is complete, and then, only after, they need to be moved into place.

dmitrig01’s picture

Version: 6.x-2.0-beta6 » 6.x-2.x-dev

And, it's postponed because I'm working to try to get a stable 2.0 release out before biting off such an ambitious feature.

helmo’s picture

Status: Postponed » Closed (won't fix)

[ Powered by #1115636: Issue Macros and Templates - Drush Make]

Drush make is being merged into drush core (discussed in issue:#1310130: Put drush make in drush core)
This means that the issue queue is also moving. The Drush project has a component called 'Make' for this purpose.

We would like to take this opportunity to leave behind old/obsolete issues, allowing us to focus on a stable make command in core. E.g. one of the major tasks ahead is making more use of the Drush core code for handling downloads and decompression.

If you feel that this issue is still relevant, feel free to re-open and move it to the Drush queue.

More information will be posted on the drush_make and drush project pages.

NOTE: I'm afraid this would add a lot of complexity, and require a lot of work as #13 mentions. The "simple" solution for #7 would in my opinion to move the patch line to the outer makefile. It's a matter of scoping.