Multiple patches on the same module [#1158970]

Hello,

I am trying to apply multiple patches to the same module and drush make gives error, but when I inspect the affected file, I see that all patches have been applied.

For e.g.
my make file has:

projects[contrib_mod][patch][] = "http://drupal.org/files/issues/XXX_1.patch"
projects[contrib_mod][patch][] = "http://drupal.org/files/issues/YYY_1.patch"

Both patches are onto the same file: contrib_mod.install

But they have been created separately, hence no combined patch exists.

I could create a combined patch and use that, but that would deviate from the module being maintained in drupal.

I was wondering if there are better ways for going around this?

Thanks.

Comments

Comment #1

skwashd CreditAttribution: skwashd commented 16 May 2011 at 12:54

What is the error emitted?

Comment #2

girishmuraly CreditAttribution: girishmuraly commented 16 May 2011 at 13:31

Thanks for the quick response.

I ran:

drush make myprofile.make

I just get:

contrib_mod downloaded from http://ftp.drupal.org/files/projects/contrib_mod-.x-.8.tar.gz.                                                                                                [ok]
contrib_mod patched with http://drupal.org/files/issues/XXX_1.patch                             [ok]
contrib_mod patched with http://drupal.org/files/issues/YYY_1.patch                             [error]
Generated PATCHES.txt file for contrib_mod                                                                   [ok]

I've temporarily fixed the problem by creating a combined patch file and using that since I was the creator of both the patches for the module. But I was wondering if it were separate patches on the same module that were required, how would I go about that.

Comment #3

skwashd CreditAttribution: skwashd commented 16 May 2011 at 16:50

try running it like this "drush --debug make myprofile.make" so we can see what is really going on and provide links to the actual patches you're using.

Comment #5

helmo CreditAttribution: helmo commented 15 December 2011 at 10:47

Status:

Active

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