[Python-modules-commits] r1360 - in /packages/turbogears/trunk/debian: changelog patches/03_sqlalchemy_identity_toolbox_fixup.diff

[kov at users.alioth.debian.org]

Author: kov
Date: Mon Sep 11 00:48:04 2006
New Revision: 1360

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1360
Log:
make toolbox work when using sqlalchemy and identity

Added:
    packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff
Modified:
    packages/turbogears/trunk/debian/changelog

Modified: packages/turbogears/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/debian/changelog?rev=1360&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/changelog (original)
+++ packages/turbogears/trunk/debian/changelog Mon Sep 11 00:48:04 2006
@@ -7,8 +7,10 @@
   - removed;
   * debian/patches/01_disable_requirements.diff:
   - updated for the new version
+  * debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff:
+  - make toolbox work when the project is using sqlalchemy + identity
 
- -- Gustavo Noronha Silva <kov at debian.org>  Sun, 10 Sep 2006 20:34:24 -0300
+ -- Gustavo Noronha Silva <kov at debian.org>  Sun, 10 Sep 2006 21:47:41 -0300
 
 turbogears (0.9a9-1) experimental; urgency=low
 

Added: packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff?rev=1360&op=file
==============================================================================
--- packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff (added)
+++ packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff Mon Sep 11 00:48:04 2006
@@ -1,0 +1,44 @@
+--- turbogears/command/base.py~	2006-09-07 19:01:38.000000000 -0300
++++ turbogears/command/base.py	2006-09-10 21:46:10.000000000 -0300
+@@ -46,6 +46,8 @@
+         development or installed project."""
+         load_project_config(self.config)
+         self.dburi = turbogears.config.get("sqlobject.dburi", None)
++        if not self.dburi:
++            self.dburi = turbogears.config.get("sqlalchemy.dburi", None)
+         if self.dburi and self.dburi.startswith("notrans_"):
+             self.dburi = self.dburi[8:]
+ 
+@@ -291,15 +293,29 @@
+                 conf = turbogears.config.config_obj( configfile = self.config )
+ 
+             turbogears.config.update({"global" : { "sqlobject.dburi" : 
+-                conf.get("global").get("sqlobject.dburi"),
++                conf.get("global").get("sqlobject.dburi", None),
++                "sqlalchemy.dburi" : conf.get("global").get("sqlalchemy.dburi", None),
+                 "visit.on" : conf.get("global").get("visit.on", False),
+-                "identity.on" : conf.get("global").get("identity.on", False)
++                "identity.on" : conf.get("global").get("identity.on", False),
++                "identity.provider" : conf.get("global").get("identity.provider", "sqlalchemy"),
++                "visit.manager" : conf.get("global").get("visit.manager", "sqlalchemy"),
++                "visit.saprovider.model" : conf.get("global").get("visit.saprovider.model", None),
++                "identity.saprovider.model.user" : conf.get("global").get("identity.saprovider.model.user", None),
++                "identity.saprovider.model.group" : conf.get("global").get("identity.saprovider.model.group", None),
++                "identity.saprovider.model.permission" : conf.get("global").get("identity.saprovider.model.permission", None),
++                "identity.saprovider.model.visit" : conf.get("global").get("identity.saprovider.model.visit", None),
+                 }})
+ 
+         except AttributeError, e:
+             pass
+ 
+-        root = SecureObject(toolbox.Toolbox(),from_any_host(self.hostlist), exclude=['noaccess'])
++        tb = toolbox.Toolbox()
++        # Disable tools which need SQLObject
++        if conf.get('global').get('identity.provider') == 'sqlalchemy':
++            for tool in tb.toolbox:
++                if tool['label'] == 'CatWalk' or tool['label'] == 'ModelDesigner':
++                    tool['disabled'] = True
++        root = SecureObject(tb,from_any_host(self.hostlist), exclude=['noaccess'])
+ 
+         cherrypy.tree.mount(root, "/")
+