Merge lp:~jshholland/ubuntu/lucid/aptdaemon/fix-beginn into lp:ubuntu/lucid/aptdaemon

[Josh Holland]

Fixes typo in aptdaemon/worker.py (ironically typoed in commit message).

beginn -> begin

Patch created using cdbs-edit-patch, seems to be fixed in the upstream lp:aptdaemon branch.

[James Westby (james-w)]

Hi Michael,

Would you review this and upload if that fits in with your plans please?

Thanks,

James

[Michael Vogt (mvo)]

Thanks a lot for your branch! This got fixed upstream for lucid. I mark it as merged because upstream has it now.

review: Approve

=== added file 'debian/patches/fix-beginn-typo.patch'
--- debian/patches/fix-beginn-typo.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-beginn-typo.patch	2010-03-29 21:27:19 +0000
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' aptdaemon/aptdaemon/worker.py aptdaemon.new/aptdaemon/worker.py
+--- aptdaemon/aptdaemon/worker.py	2010-03-29 22:16:28.426820000 +0100
++++ aptdaemon.new/aptdaemon/worker.py	2010-03-29 22:17:25.433493138 +0100
+@@ -571,7 +571,7 @@
+             # Run dpkg --configure -a to recover from a failed transaction
+             self.trans.status = STATUS_CLEANING_UP
+             self._unlock_cache()
+-            progress = DaemonDpkgRecoverProgress(self.trans, beginn=90, end=95)
++            progress = DaemonDpkgRecoverProgress(self.trans, begin=90, end=95)
+             progress.startUpdate()
+             progress.run()
+             progress.finishUpdate()