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

[Barry Warsaw]

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

[lp:~barry/ubuntu/lucid/update-manager/fix-511628]

258. By Barry Warsaw on 2010-03-12

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

[James Westby (james-w)]

review: Abstain

[Michael Vogt (mvo)]

Thanks Barry, you rock!

review: Approve

[Michael Vogt (mvo)]

(and I should have more tests)

[Barry Warsaw (barry)]

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

[Michael Vogt (mvo)]

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.

[James Westby (james-w)]

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

[Barry Warsaw (barry)]

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.

=== modified file 'UpdateManager/SafeGConfClient.py'
--- UpdateManager/SafeGConfClient.py	2010-01-12 18:15:52 +0000
+++ UpdateManager/SafeGConfClient.py	2010-03-12 15:06:27 +0000
@@ -20,6 +20,7 @@
 #  USA
 
 import gconf
+import gobject
 
 class SafeGConfClient(object):
     """A gconfclient that does not crash if gconf is not avaialble"""

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-08 20:58:44 +0000
+++ debian/changelog	2010-03-12 15:06:27 +0000
@@ -1,3 +1,9 @@
+update-manager (1:0.133ubuntu1) lucid; urgency=low
+
+  * Fix obvious NameError by adding a missing import. (LP: #537250)
+
+ -- Barry Warsaw <[e-mail]>  Thu, 11 Mar 2010 21:23:25 -0500
+
 update-manager (1:0.133) lucid; urgency=low
 
   [ Michael Vogt ]