Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar_network/db/routes.py
diff options
context:
space:
mode:
authorAleksey Lim <alsroot@sugarlabs.org>2013-10-21 08:06:00 (GMT)
committer Aleksey Lim <alsroot@sugarlabs.org>2013-10-21 08:06:00 (GMT)
commit8223b2b538540aa227a30cc18434571455af5bc3 (patch)
tree1c5c275ff8c6471687335d50aee6666dd2f67412 /sugar_network/db/routes.py
parent58471a0a713dd3ef77276a3d0df23c44a5ddeb0d (diff)
Switch to RSA auth keys; keep private key per user, not per sugar profile
Diffstat (limited to 'sugar_network/db/routes.py')
-rw-r--r--sugar_network/db/routes.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/sugar_network/db/routes.py b/sugar_network/db/routes.py
index b863b64..79682d1 100644
--- a/sugar_network/db/routes.py
+++ b/sugar_network/db/routes.py
@@ -321,9 +321,14 @@ def _read_blob(request, prop, value):
finally:
dst.close()
+ if request.prop and request.content_type:
+ mime_type = request.content_type
+ else:
+ mime_type = prop.mime_type
+
return {'blob': dst.name,
'digest': digest.hexdigest(),
- 'mime_type': request.content_type or prop.mime_type,
+ 'mime_type': mime_type,
}