Opened 9 years ago

Closed 8 years ago

Last modified 7 years ago

#2402 closed defect (fixed)

micro-revision.i generation broken on maint-0.2.1

Reported by: Sebastian Owned by:
Priority: High Milestone:
Component: Core Tor/Tor Version:
Severity: Keywords:
Cc: Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

The code doesn't handle git revisions well. This leads to the current tarball (0.2.1.29) to show the micro-revision of "8e9b25e6c7a2e70c", which is a commit in master. I panicked for a second thinking that we might be shipping a copy of master as stable, but it appears that 8e9b25e6c7a2e70c was simply the non-0.2.1 commit that armadev built last when making the tarball.

Child Tickets

Change History (12)

comment:1 Changed 9 years ago by Sebastian

Affected code is in src/or/Makefile.am in the micro-revision.i: target. We should probably just backport (a version of) daa0326aaaa85a760be94ee2360cfa61a9fb5be2 to make this sane.

comment:2 Changed 9 years ago by nickm

Status: newneeds_review

I've done two fixes: one is a partial backport of the parts where we generate the git revisions, but not the parts where we parse them. It's in branch bug2402_git in my public repository.

But personally, I prefer an approach where we just don't include any micro-revision info at all in 0.2.1. That approach is in bug2402_nothing in my public repository.

comment:3 Changed 9 years ago by Sebastian

I agree that just leaving it out is the simpler and totally sufficient solution for 0.2.1.x. Weasel seemed to like the ability to check out the microrevision to see what part of his userbase has upgraded, but since (I think) he patches those parts of Tor anyways it seems that this wouldn't hurt anything. The branch seems to work fine in my testing.

comment:4 Changed 9 years ago by arma

Leaving it out sounds like a great 0.2.1 solution.

comment:5 Changed 9 years ago by nickm

Resolution: fixed
Status: needs_reviewclosed

Merged bug2402_nothing. Thanks!

comment:6 Changed 9 years ago by nickm

Resolution: fixed
Status: closedreopened

Reopening. It looks like we totally misunderstood what weasel needed, and we ought to get git microrevisions working solidly.

comment:7 Changed 9 years ago by nickm

See branch bug2402_again. it is based on a revert of bug2402_nothing and a minimized version of bug2402_git.

comment:8 Changed 9 years ago by arma

bug2402_again looks cursorily plausible to me.

We could put it into maint-0.2.1 in general, or we could just encourage weasel to patch his deb with it.

comment:9 Changed 9 years ago by nickm

Status: reopenedneeds_review

comment:10 Changed 8 years ago by nickm

Resolution: fixed
Status: needs_reviewclosed

Merged.

comment:11 Changed 7 years ago by nickm

Component: Tor ClientTor

comment:12 Changed 7 years ago by nickm

Milestone: Tor: 0.2.1.x-final

Milestone Tor: 0.2.1.x-final deleted

Note: See TracTickets for help on using tickets.