I tried an Aegir-from-scratch install of COD, using the 6.x makefile stub
http://drupalcode.org/project/cod.git/blob/refs/heads/6.x-1.x:/cod-stabl... (Raw)

Got only one error. But it was fatal.

strongarm downloaded from http://ftp.drupal.org/files/projects/strongarm-6.x-2.1.tar.gz.
patching file strongarm.module Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file strongarm.module.rej
Unable to patch strongarm with 792472_15_node_pipe.patch.

So this smells like a patch that has now been applied upstream, and the patch is no longer needed. Yay.

Also non-fatal

features cloned from http://git.drupal.org/project/features.git.
Checked out branch 6.x-1.x.
patching file includes/features.menu.inc Hunk #1 succeeded at 195 (offset 49 lines). Hunk #2 succeeded at 253 (offset 49 lines). Hunk #3 succeeded at 312 with fuzz 2 (offset 49 lines). Hunk #4 succeeded at 340 (offset 49 lines). Hunk #5 succeeded at 375 (offset 49 lines).
features patched with 968826-features-menu-uuid.patch.

Trying again with the 6.x-1.x:/cod-dev.make was identical.

CommentFileSizeAuthor
#1 fix_strongarmpatch.patch711 bytescravecode

Comments

cravecode’s picture

Status: Active » Patch (to be ported)
StatusFileSize
new711 bytes

Attached is a patch to remove the offending patch file. I believe it is no longer needed according to http://drupal.org/node/792472#comment-5464188 comment #30 referencing: 6.x-2.1 release notes

dman’s picture

W00t.
Looks like that is all that is needed!

rupl’s picture

Assigned: Unassigned » rupl
Status: Patch (to be ported) » Needs work

I applied the patch but somehow received an identical error. Will look into this a little more deeply when I get a second.

cravecode’s picture

I'm not sure how you'd get an identical error. The patch removes the reference to the strongarm patch file that is failing. Could you provide the error(s) you're getting?

gnuget’s picture

Oks,

I tested the patch of brian.hallwaytech and works fine.

The problem here i think come from how you get COD.

The cod-dev.make the only thing to do is download the cod.make file and run it, then the code.make version who is run it in the end is not the patched version.

The way to i test the patch was:

Applied the patch into the cod.make file and after that i temporally added this line:

projects[drupal] = 6.22

(because the cod.make file doesn't download the Drupal Core that do it the cod-dev.make, so for test the patch we need temporally tell the cod.make to also download the core)

And it's all, after that just run

drush make cod.make

and should work fine.

christianchristensen’s picture

The patch in #1 worked for me! The thing I had to note as in #5 is that the referenced makefile doesn't have the patch. Running against the patched version worked great for me

gnuget’s picture

Status: Needs work » Reviewed & tested by the community

Well then if two of us are agree with this patch i think to we can mark this as reviewed and tested by the community

rupl’s picture

Status: Reviewed & tested by the community » Fixed

Committed to 6.x-1.x. Thanks!

Status: Fixed » Closed (fixed)

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