From: Josh Durgin <jdurgin@redhat.com>
Date: Mon, 10 Nov 2014 22:14:11 +0000 (-0800)
Subject: client: don't hide boto return values
X-Git-Tag: v1.2~5^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=acafe780b68cfc7bae919a4acafd86ead16aa06f;p=radosgw-agent.git

client: don't hide boto return values

The decorator for translating boto exceptions needs to return
explicitly, or it will lose the return value of the original function,
and cause full sync to fail for objects that aren't in the bucket
index log.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/radosgw_agent/client.py b/radosgw_agent/client.py
index 9be5681..94db32a 100644
--- a/radosgw_agent/client.py
+++ b/radosgw_agent/client.py
@@ -86,7 +86,7 @@ def boto_call(func):
     @functools.wraps(func)
     def translate_exception(*args, **kwargs):
         try:
-            func(*args, **kwargs)
+            return func(*args, **kwargs)
         except boto.exception.S3ResponseError as e:
             raise code_to_exc.get(e.status, HttpError)(e.status, e.body)
     return translate_exception