[Mpuls-commits] r781 - in waska/trunk: . waskaweb/lib

[scm-commit@wald.intevation.org]

Author: frank
Date: 2010-01-20 10:53:28 +0100 (Wed, 20 Jan 2010)
New Revision: 781

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/lib/security.py
Log:
Source cosmetics


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2010-01-20 09:49:36 UTC (rev 780)
+++ waska/trunk/ChangeLog.txt	2010-01-20 09:53:28 UTC (rev 781)
@@ -3,9 +3,6 @@
 	Added optional choice list to login page to select database (in setups
 	without client certificates)
 
-	* waskaweb/i18n/de/LC_MESSAGES/waskaweb.po: 
-	New translations for choice list login page.
-	
 	* waskaweb/lib/helpers.py (load_db_list_from_file): New, load db list.
 	(getDbSelectionList): Helper function called from mako templates.
 
@@ -19,6 +16,9 @@
 	* waskaweb/templates/login-list.mako: New, to be copied to login.mako 
 	in setups when needed.
 
+	* waskaweb/i18n/de/LC_MESSAGES/waskaweb.po: 
+	New translations for choice list login page.
+	
 	* waskaweb/public/images/weblogo_waska.png: New mpuls WASKA web Logo,
 	to be copied to logo_ka_75.png in setups when needed.
 

Modified: waska/trunk/waskaweb/lib/security.py
===================================================================
--- waska/trunk/waskaweb/lib/security.py	2010-01-20 09:49:36 UTC (rev 780)
+++ waska/trunk/waskaweb/lib/security.py	2010-01-20 09:53:28 UTC (rev 781)
@@ -214,8 +214,7 @@
             dbname = request.environ['SSL_CLIENT_S_DN_CN'].split(' ')[3].lower()
             return NEW_DBS.get(dbname, dbname)
         except: 
-            print >> sys.stderr, "Could not determine database name from client
-certificate."
+            print >> sys.stderr, "Could not determine database name from client certificate."
     elif request.params.has_key('DB_NAME_FROM_LIST'):
         dbname = request.params['DB_NAME_FROM_LIST'].lower()
         session['DB_NAME'] = dbname