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 0f46ff7..ebe33d5 100644 (file)
--- 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...