Comments

kbahey’s picture

Priority: Critical » Normal
Status: Reviewed & tested by the community » Needs review

Patch is not in the correct format.

Please use unidiff format.

See here for more http://drupal.org/patch

ckg’s picture

StatusFileSize
new2.58 KB

Okay... hope I got the patch right this time. Thanks for the pointer.

kbahey’s picture

Committed to 5.x and HEAD.

Thanks.

kbahey’s picture

Status: Needs review » Fixed
Anonymous’s picture

Status: Fixed » Closed (fixed)
tanjerine’s picture

StatusFileSize
new2.93 KB

hi! im using this patch for my postgres/drupal installation and i noticed a typo in line 30 :

! approver_uid interger NOT NULL default '0',

it should read:

! approver_uid integer NOT NULL default '0',

this prevents the table from being created. im attaching the edited file with an edited filename for clarity. thanks!

tanjerine’s picture

Status: Closed (fixed) » Needs review
StatusFileSize
new2.93 KB

my bad. i forgot to mention that line 77 of the userpoints.install patch also needed to be edited. from:

+ case 'mysql':

to:

+ case 'pgsql':

kbahey’s picture

Version: 5.x-2.10 » 5.x-2.11
Status: Needs review » Needs work

The patch failed to apply.

Please download 5.x-2.11 (available in 12 hours), test the postgres changes in it first, then if there are issues, create a new patch against 2.11.

Check 2.11 here http://drupal.org/node/154482

$ patch -p0 < userpoints.install-typoedited_0.diff
(Stripping trailing CRs from patch.)
patching file userpoints.install
Hunk #1 FAILED at 27.
Hunk #2 succeeded at 76 with fuzz 2 (offset -11 lines).
patch unexpectedly ends in middle of line
Hunk #3 succeeded at 121 with fuzz 2 (offset 3 lines).
1 out of 3 hunks FAILED -- saving rejects to file userpoints.install.rej
tanjerine’s picture

Component: Code » Code: userpoints.module
StatusFileSize
new2.94 KB

Sorry about that. Must have been something with the way the file was saved. Attaching the new patch for postgres. Please note though, that Im using this patch with version 4.7. But will try it with the 5.2 version (as you suggested) when it comes out.

[sarah ~/userpoints/userpoints 11:52:56]$ patch -p0 < userpoints.install-20070626.diff
(Stripping trailing CRs from patch.)
patching file userpoints.install
Hunk #1 succeeded at 27 with fuzz 1.
Hunk #2 succeeded at 78 (offset -9 lines).
Hunk #3 succeeded at 109 (offset -9 lines).

this patch should work.

kbahey’s picture

Still fails.

$ patch --dry-run -p0 < u.patch
(Stripping trailing CRs from patch.)
patching file userpoints.install
Hunk #1 FAILED at 27.
Hunk #2 succeeded at 76 with fuzz 2 (offset -11 lines).
Hunk #3 succeeded at 121 with fuzz 2 (offset 3 lines).
1 out of 3 hunks FAILED -- saving rejects to file userpoints.install.rej

4.7 and 5.x are significantly different, and there is no way a postgres patch will work on both as is.

tanjerine’s picture

Oh, i hadn't yet tested or tweaked the patch to work with 5.2. As i said earlier, I was using 4.7 and that patch works for 4.7 (downloaded the module again and ran the patch against it). Will try it with 5.2 when i am able to set it up on my machine.

Thanks.

mile23’s picture

Component: Code: userpoints.module » Code: userpoints API
Status: Needs work » Closed (fixed)

5.x-3.7 has a PostreSQL installer.