Merge lp:~nataliabidart/ubuntuone-client/fix-create_share_http into lp:ubuntuone-client

[Natalia Bidart]

Fixing bug introduced on revno 220: callback() takes exactly 2 arguments (1 given).

[Natalia Bidart (nataliabidart)]

Fixing bug introduced on revno 220.

[dobey (dobey)]

Is there not a bug report for this? We'll need one, as this presumably affects stable-1-0 also, and we'll need to get it in an SRU.

[Facundo Batista (facundo)]

Like it!

review: Approve

[Stuart Langridge (sil)]

I don't know what this is fixing :(

review: Abstain

[Natalia Bidart (nataliabidart)]

> I don't know what this is fixing :(

The error is the one specified on the commit message:

"callback() takes exactly 2 arguments (1 given)"

If no argument is passed to deferred.callback, it fails and the share can not be made.

[John O'Brien (jdobrien)]

good catch

review: Approve

[Natalia Bidart (nataliabidart)]

> Is there not a bug report for this? We'll need one, as this presumably affects
> stable-1-0 also, and we'll need to get it in an SRU.

Yes, indeed. I created Bug #494024 with tag ubuntuone-sru.

Thanks for the reminder!

[dobey (dobey)]

On Tue, 2009-12-08 at 13:38 +0000, Naty Bidart wrote:
> > Is there not a bug report for this? We'll need one, as this presumably affects
> > stable-1-0 also, and we'll need to get it in an SRU.
>
> Yes, indeed. I created Bug #494024 with tag ubuntuone-sru.
>
> Thanks for the reminder!

I've updated this accordingly as it looks like Roman (rtgv) had already
filed this as bug #492100 on the same day I asked about it on here.
Thanks.

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2009-12-01 21:54:29 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2009-12-03 19:00:26 +0000
@@ -1856,7 +1856,7 @@
         except HTTPError, e:
             deferred.errback(Failure(e))
 
-        deferred.callback()
+        deferred.callback(None)
 
     def _run(self):
         """