"A function that has acquired a lock may attempt to renew a lock (extend the duration of the lock) by calling lock_acquire() again during the operation. Failure to renew a lock is indicative that another request has acquired the lock, and that the current operation may need to be aborted."

This text is double.
In lock.inc it's on line 41-44 and on line 56-59.

CommentFileSizeAuthor
#10 obtainng.patch747 bytesAnonymous (not verified)
#7 719500_lock.inc_.patch855 bytessender
#2 719500.patch1010 bytesjhodgdon

Comments

jhodgdon’s picture

jhodgdon
she/her
Primary language English
commented
Issue tags: +Novice

Good catch!

jhodgdon’s picture

jhodgdon
she/her
Primary language English
commented
StatusFileSize
new 719500.patch1010 bytes

Here's a patch that removes the duplicated text.

jhodgdon’s picture

jhodgdon
she/her
Primary language English
commented
Status: Active » Needs review

As a note: After this is committed, it needs to be ported to Drupal 6 also. http://api.drupal.org/api/group/lock has the same problem in D6 and D7.

dries’s picture

dries commented
Version: 7.x-dev » 6.x-dev
Status: Needs review » Patch (to be ported)

Committed to CVS. Thanks a lot.

jhodgdon’s picture

jhodgdon
she/her
Primary language English
commented
Title: Documentation problem with lock.inc. » lock.inc has some duplicated doc lines

Fixing title...

sender’s picture

sender commented
Assigned: Unassigned » sender
sender’s picture

sender commented
StatusFileSize
new 719500_lock.inc_.patch855 bytes

Patch for D6.

sender’s picture

sender commented
Status: Patch (to be ported) » Needs review
jhodgdon’s picture

jhodgdon
she/her
Primary language English
commented
Status: Needs review » Reviewed & tested by the community

This looks fine to me.

Anonymous’s picture

Anonymous (not verified) commented
StatusFileSize
new obtainng.patch747 bytes

Perhaps a small typo of a missing 'i' in "obtainng"?

jhodgdon’s picture

jhodgdon
she/her
Primary language English
commented

The patch in #10 does not fix this issue (removing duplicated doc lines). It fixes a separate issue -- a typo that appears in both Drupal 6 and Drupal 7. It needs to be fixed in D7 first, then ported to D6. So I filed a new issue and moved the patch over there:
#791610: Typo in lock.inc

The patch in #7 is still RTBC for Drupal 6.

gábor hojtsy’s picture

gábor hojtsy
he/him
Primary language Hungarian
Location Hungary
commented
Status: Reviewed & tested by the community » Fixed

Committed, thanks.

Status: Fixed » Closed (fixed)
Issue tags: -Novice

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

Issue tags: +Novice

Restoring issue tags, see #2125755: System messages removed all issue tags during D7 upgrade.