Drush make currently just rewrites the version in the .info file to be the git hash in the event of a git clone from a hash. Drupal.org rewrites using more ineligible logic (eg, 5 commits past last stable, etc) so as to not cause panic when somebody views the available updates screen from within Drupal. The code d.o. uses is here: http://drupalcode.org/project/drupalorg.git/blob/refs/heads/6.x-3.x:/dru...

CommentFileSizeAuthor
#3 drush-make-info-rewrite-1693452-03.patch2.47 KBjhedstrom
#1 drush-make-info-rewrite-1693452-01.patch897 bytesjhedstrom

Comments

jhedstrom’s picture

jhedstrom
Primary language English
Location Portland, OR
commented
Category: feature » bug
Status: Active » Needs review
StatusFileSize
new drush-make-info-rewrite-1693452-01.patch897 bytes

Turns out this was actually a regression. Tagging the .git directory for removal after the build instead of removing it at the time of download allows the logic found in drush_pm_git_drupalorg_compute_rebuild_version() to work properly again.

Setting to needs review for now, but will commit shortly.

jhedstrom’s picture

jhedstrom
Primary language English
Location Portland, OR
commented
Priority: Normal » Major

The regression happened in this commit 134990ead6f69a6b152b1a8f12b22cbad76bc6e6. Also bumping priority since builds done without this get the .info file version set as the revision, which causes scary warnings from the update module about unsupported releases.

jhedstrom’s picture

jhedstrom
Primary language English
Location Portland, OR
commented
StatusFileSize
new drush-make-info-rewrite-1693452-03.patch2.47 KB

Updated patch with tests.

jhedstrom’s picture

jhedstrom
Primary language English
Location Portland, OR
commented
Status: Needs review » Fixed

Committed in 6dfb696.

jhedstrom’s picture

jhedstrom
Primary language English
Location Portland, OR
commented
Status: Fixed » Patch (to be ported)

This needs to be committed to 5.x as well.

jhedstrom’s picture

jhedstrom
Primary language English
Location Portland, OR
commented
Status: Patch (to be ported) » Fixed

Committed in 1d3d650.

Status: Fixed » Closed (fixed)

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