Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drush 8.1.10 not patching multiple patches for a project #2685

Closed
shrop opened this issue Mar 21, 2017 · 1 comment
Closed

Drush 8.1.10 not patching multiple patches for a project #2685

shrop opened this issue Mar 21, 2017 · 1 comment

Comments

@shrop
Copy link

shrop commented Mar 21, 2017

When patching a project with more than one patch, the second patch consistently fails. I can switch the order and the second fails the same way. I am running Drush 8.1.10.

Here is the section from the drush make file:

; Field collection feeds
projects[field_collection_feeds][type] = module
projects[field_collection_feeds][subdir] = contrib
projects[field_collection_feeds][version] = 1.0-alpha3
projects[field_collection_feeds][patch][] = https://www.drupal.org/files/issues/field_collection_feeds-broken_references_on_delete-1992422-6.patch
projects[field_collection_feeds][patch][] = https://www.drupal.org/files/issues/FeedsUpdateIssue-1921128-12.patch

Here is an example where the second patch fails for me running drush -vvv:

Downloading field_collection_feeds-7.x-1.0-alpha3.tar.gz was successful.                                       [notice]
Md5 checksum of field_collection_feeds-7.x-1.0-alpha3.tar.gz verified.                                         [notice]
Project field_collection_feeds (7.x-1.0-alpha3) downloaded to                                               [success]
/private/tmp/make_tmp_1490058590_58d07d5e1f465/__build__/sites/all/modules/contrib/field_collection_feeds.
Command dispatch complete                                                                                      [notice]
field_collection_feeds-7.x-1.0-alpha3 downloaded.                                                           [ok]
/Users/shrop/.drush/cache/download/https---www.drupal.org-files-issues-field_collection_feeds-broken_references_on_delete-1992422-6.patch   [notice]
retrieved from cache.
Checking patch plugins/FeedsFieldCollectionProcessor.inc...                                                    [notice]
Applied patch plugins/FeedsFieldCollectionProcessor.inc cleanly.
field_collection_feeds patched with field_collection_feeds-broken_references_on_delete-1992422-6.patch.     [ok]
/Users/shrop/.drush/cache/download/https---www.drupal.org-files-issues-FeedsUpdateIssue-1921128-12.patch       [notice]
retrieved from cache.
can't find file to patch at input line 3                                                                       [notice]
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- a/plugins/FeedsFieldCollectionProcessor.inc
|+++ b/plugins/FeedsFieldCollectionProcessor.inc
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
4 out of 4 hunks ignored
Unable to patch field_collection_feeds with FeedsUpdateIssue-1921128-12.patch.                              [error]
@shrop
Copy link
Author

shrop commented Mar 21, 2017

Turns out Drush is working just fine. The patches seem to have a conflict with each other.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant