For some reason my file_entity issue patches are failing on patch syntax when the real problem in PIRF seems to be that it's attempting to download the file.module from project/file.

http://qa.drupal.org/pifr/test/218738

Comments

rfay’s picture

Status: Active » Fixed

Well, no... I don't quite understand your comment, but...

The patch just doesn't apply. Let me know if I'm missing something...

rfay@Randys-MacBook-Air:/tmp/file_entity$ git checkout 7.x-2.x
Switched to branch '7.x-2.x'
rfay@Randys-MacBook-Air:/tmp/file_entity$ git apply 1401548-devel-tabs_0.patch 
error: patch failed: file_entity.module:64
error: file_entity.module: patch does not apply
error: patch failed: file_entity.pages.inc:20
error: file_entity.pages.inc: patch does not apply

Dave Reid’s picture

Hrm, maybe it was a conflict and I just didn't re-roll. Not sure. :/ Thanks for checking.

rfay’s picture

Well, I guess you move too fast for me, and it doesn't apply because you already committed it. I couldn't figure out what part of the testing log you were referring too.

I do see that the dependencies need to be rebuilt, and the file module excluded, so I'll do that:

drush pdsd file_entity 7.x-2.x-dev
Array
(
    [1233062] => Array
        (
            [uri] => ctools
            [version] => 7.x-1.0-rc1
            [tag] => 7.x-1.0-rc1
        )

    [520766] => Array
        (
            [uri] => file
            [version] => 7.x-1.x-dev
            [tag] => master
        )

)
rfay’s picture

I excluded file from dependency generation, so the only dependency listed now is ctools.

Status: Fixed » Closed (fixed)

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