Merge lp://staging/~lynxman/ubuntu/precise/puppet/puppetlabsfixbug12844 into lp://staging/ubuntu/precise/puppet
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~lynxman/ubuntu/precise/puppet/puppetlabsfixbug12844 |
| Merge into: | lp://staging/ubuntu/precise/puppet |
| Diff against target: |
4139 lines (+3430/-399) 29 files modified
.pc/.quilt_patches (+1/-0) .pc/.quilt_series (+1/-0) .pc/applied-patches (+1/-0) .pc/puppet-12844/lib/puppet/agent.rb (+114/-0) .pc/puppet-12844/lib/puppet/agent/locker.rb (+30/-0) .pc/puppet-12844/lib/puppet/application/agent.rb (+508/-0) .pc/puppet-12844/lib/puppet/util/anonymous_filelock.rb (+36/-0) .pc/puppet-12844/lib/puppet/util/pidlock.rb (+68/-0) .pc/puppet-12844/spec/unit/agent/locker_spec.rb (+87/-0) .pc/puppet-12844/spec/unit/agent_spec.rb (+285/-0) .pc/puppet-12844/spec/unit/application/agent_spec.rb (+631/-0) .pc/puppet-12844/spec/unit/util/anonymous_filelock_spec.rb (+78/-0) .pc/puppet-12844/spec/unit/util/pidlock_spec.rb (+208/-0) debian/changelog (+13/-0) debian/patches/puppet-12844 (+979/-0) debian/patches/series (+1/-0) debian/puppetmaster-passenger.postinst (+7/-0) lib/puppet/agent.rb (+2/-4) lib/puppet/agent/locker.rb (+15/-1) lib/puppet/application/agent.rb (+3/-11) lib/puppet/util/anonymous_filelock.rb (+0/-36) lib/puppet/util/pidlock.rb (+71/-22) spec/unit/agent/locker_spec.rb (+12/-0) spec/unit/agent_backward_compatibility_spec.rb (+152/-0) spec/unit/agent_spec.rb (+0/-6) spec/unit/application/agent_spec.rb (+1/-33) spec/unit/util/anonymous_filelock_spec.rb (+0/-78) spec/unit/util/pidlock_spec.rb (+0/-208) test/util/pidlock.rb (+126/-0) |
| To merge this branch: | bzr merge lp://staging/~lynxman/ubuntu/precise/puppet/puppetlabsfixbug12844 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Needs Fixing | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
This new puppet package adds a patch by puppetlabs
This reverts commit fcac8f7163c9988
was a backwards-
behavior related to puppet agent lockfiles that was introduced in
2.7.10. The fix is being reverted because we've decided to remove
the new lockfile behavior from the 2.7.x series entirely, and push
it out to 3.x.
This patch is needed in order to not break compatibility with the current user base, will be introduced as part of 2.7.12 but since we're shipping 2.7.11 for 12.04 it would be wise to include this reversion in time.
Unmerged revisions
- 64. By Marc Cluet
-
* Correct patch DEP3 header format
- 63. By Marc Cluet
-
* Added patch for puppet 12844
- 62. By Marc Cluet
-
* Added patch to solve puppetlabs bug #12844
- Reverts behaviour of agent lockfiles
- Fixes unit test to readmit old behaviour
* debian/puppetmaster- passenger. postinst (LP: #948983)
- Fixed rack directory location
- Added proper enabling of apache2 headers mod
* debian/puppetmaster- passenger. postinst (LP: #950183)
- Make sure we error if puppet config print doesn't work
Hi Marc
Some initial feedback:
1) d/changelog: you appear to have jumped one two many ubuntu versions :-)
puppet (2.7.11-1ubuntu2) precise; urgency=low
* Added patch to solve puppetlabs bug #12844
- Reverts behaviour of agent lockfiles
- Fixes unit test to readmit old behaviour
* debian/
- Fixed rack directory location
- Added proper enabling of apache2 headers mod
* debian/
- Make sure we error if puppet config print doesn't work
-- Marc Cluet <email address hidden> Fri, 09 Mar 2012 09:49:23 +0000
puppet (2.7.11-1) unstable; urgency=high
2) d/patches/
I understand that this is the beef of this change; the DEP-3 fields should all be at the top of the patch file and you appear to have some generated content:
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://
are templates for supplementary fields that you might want to add:
It would also be great if you could reference the upstream pull request in the Origin: field - https:/
You can also drop the Forwarded field - its not required in this case.
The other fixes both look OK.