From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 23 Oct 2013 08:06:57 +0000 (+0300)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: 0.2-6~9^2~7
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=7e93140d9e1d0383e71e1dd5f47010754505f1c8;hp=17a01cef3f265688e6f8a1a4fec2d0abb3cf7397

Merge branch 'master' of ssh://git.onelab.eu/git/myslice
---

diff --git a/myslice/myslice.ini b/myslice/myslice.ini.localhost
similarity index 100%
rename from myslice/myslice.ini
rename to myslice/myslice.ini.localhost
diff --git a/unfold/loginrequired.py b/unfold/loginrequired.py
index 0f46ff79..ebe33d51 100644
--- a/unfold/loginrequired.py
+++ b/unfold/loginrequired.py
@@ -32,7 +32,9 @@ def logout_on_manifold_exception (fun_that_returns_httpresponse):
         except ManifoldException, manifold_result:
             # xxx we need a means to display this message to user...
             from django.contrib.auth import logout
-            logout(request)
+            # in some unusual cases, this might fail
+            try: logout(request)
+            except: pass
             return HttpResponseRedirect ('/')
         except Exception, e:
             # xxx we need to sugarcoat this error message in some error template...