Ubuntu
update-manager package

Merge lp://qastaging/~barry/ubuntu/lucid/update-manager/fix-511628 into lp://qastaging/ubuntu/lucid/update-manager

  1. Lucid (10.04)
  2. fix-511628
  3. Merge into lucid
Proposed by Barry Warsaw
Status: Merged
Merge reported by: Barry Warsaw
Merged at revision: not available
Proposed branch: lp://qastaging/~barry/ubuntu/lucid/update-manager/fix-511628
Merge into: lp://qastaging/ubuntu/lucid/update-manager
Diff against target: 25 lines (+7/-0)
2 files modified
UpdateManager/SafeGConfClient.py (+1/-0)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp://qastaging/~barry/ubuntu/lucid/update-manager/fix-511628
Reviewer Review Type Date Requested Status
Michael Vogt Approve
James Westby (community) Abstain
Review via email: mp+21208@code.qastaging.launchpad.net

Description of the change

Fixes the obvious NameError. Hopefully this time the merge proposal will be sane ;).

To post a comment you must log in.
lp://qastaging/~barry/ubuntu/lucid/update-manager/fix-511628 updated
258. By Barry Warsaw

Fix obvious NameError by adding a missing import. (LP: #537250)

Revision history for this message
James Westby (james-w) :
review: Abstain
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks Barry, you rock!

review: Approve
Revision history for this message
Michael Vogt (mvo) wrote :

(and I should have more tests)

Revision history for this message
Barry Warsaw (barry) wrote :

Thanks Michael. Will you merge the branch or is that something I can do?

Revision history for this message
Michael Vogt (mvo) wrote :

Its merged and uploaded, currently waiting for approval. I was not able to merge it into trunk because the branches have no common ancestor. But I assume with the upload it will be auto-imported and LP notices that its merged. Otherwise we will have to mark it merged manually.

Revision history for this message
James Westby (james-w) wrote :

On Sat, 13 Mar 2010 07:49:23 -0000, Michael Vogt <email address hidden> wrote:
> Its merged and uploaded, currently waiting for approval. I was not able to merge it into trunk because the branches have no common ancestor. But I assume with the upload it will be auto-imported and LP notices that its merged. Otherwise we will have to mark it merged manually.

You will have to do this manually while there is no common ancestry.

Thanks,

James

Revision history for this message
Barry Warsaw (barry) wrote :

Looking at the trunk, I believe you've done this Michael, so I'm marking the branch as merged. Let me know if I'm mistaken.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: