Merge lp://qastaging/~clint-fewbar/ubuntu/natty/squid/fix-upgrades-after-reload into lp://qastaging/ubuntu/natty/squid
Proposed by
Clint Byrum
| Status: | Merged |
|---|---|
| Merged at revision: | 58 |
| Proposed branch: | lp://qastaging/~clint-fewbar/ubuntu/natty/squid/fix-upgrades-after-reload |
| Merge into: | lp://qastaging/ubuntu/natty/squid |
| Diff against target: |
55 lines (+37/-0) 2 files modified
debian/changelog (+7/-0) debian/preinst (+30/-0) |
| To merge this branch: | bzr merge lp://qastaging/~clint-fewbar/ubuntu/natty/squid/fix-upgrades-after-reload |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Sponsors | Pending | ||
|
Review via email:
|
|||
Description of the change
This is the same merge as the one proposed with lucid, except I've removed the check for what version we're upgrading from. Ultimately, this is a useful check no matter what, given that the user could have refused to merge the upstart job file if it has local changes.
I have not tested it as thorougly on natty as I did on lucid, though I did at least check to see that it installs and runs the code appropriately if the squid job has lost track of its squid daemon.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
