Merge lp:~vanvugt/ubuntu/oneiric/mediatomb/fix-212441 into lp:ubuntu/oneiric/mediatomb
Proposed by
Daniel van Vugt
Status: | Merged |
---|---|
Merged at revision: | 17 |
Proposed branch: | lp:~vanvugt/ubuntu/oneiric/mediatomb/fix-212441 |
Merge into: | lp:ubuntu/oneiric/mediatomb |
Diff against target: |
38 lines (+34/-0) 1 file modified
debian/mediatomb-daemon.mediatomb.upstart (+34/-0) |
To merge this branch: | bzr merge lp:~vanvugt/ubuntu/oneiric/mediatomb/fix-212441 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Luke Yelavich (community) | Approve | ||
Evan Broder | Pending | ||
Ubuntu branches | Pending | ||
Review via email: mp+62263@code.launchpad.net |
This proposal supersedes a proposal from 2011-05-11.
Commit message
Introduce Upstart support to avoid start-up races (LP: #212441)
Description of the change
I've now simplified this proposal. It is now trivial.
All aforementioned build failures are actually not related to this change, but are fixed here:
lp:~vanvugt/ubuntu/oneiric/mediatomb/fix-770964-784431
To post a comment you must log in.
Thanks for contributing this patch! This sort of racy behavior is exactly what Upstart was designed to solve, and I'm glad that people are starting to see it a solution for that class of problem.
I do have a few concerns about the patch - one is a bit more substantial, and the rest are simply small nits to help you understand our processes a bit better.
First off, I would like to see the /etc/default config file eliminated. /etc/default files were introduced to have a short space to contain the values that would be commonly changed, to minimize conflicts when the init.d script changed. Upstart config files are short and simple enough that this is no longer necessary - end users should simply edit the Upstart config file, and resolve conflicts when the come up. I don't think you'd need a "script" block once you've done that - you can move the route changes into a pre-start and then have a single "exec" line.
Now for the smaller stuff. The version number in the changelog is a bit weird - I assume that's a mistake, but that should be 0.12.1-0ubuntu2. You also target the change at maverick - new changes should always be targeted at the release currently under development (which is currently oneiric). Last, when we close bugs in our changelogs, they should always be in the form "(LP: #212411)" (i.e. no "fixes")
While you look into these considerations, I'm going to change the status of this merge proposal to "Work in progress" to help us keep track of which proposed patches still need review. Feel free to set the status back to "Needs review" when you feel you've addressed the concerns I outlined above. And thanks again for your contribution!