[Python-modules-commits] r1361 - /packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff

[kov at users.alioth.debian.org]

Author: kov
Date: Mon Sep 11 01:02:38 2006
New Revision: 1361

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1361
Log:
make toolbox work when using sqlalchemy and identity, while still
working with sqlobject hehe

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

Modified: 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=1361&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff (original)
+++ packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff Mon Sep 11 01:02:38 2006
@@ -1,5 +1,5 @@
---- turbogears/command/base.py~	2006-09-07 19:01:38.000000000 -0300
-+++ turbogears/command/base.py	2006-09-10 21:46:10.000000000 -0300
+--- TurboGears-1.0b1.old/turbogears/command/base.py	2006-09-07 19:01:38.000000000 -0300
++++ TurboGears-1.0b1/turbogears/command/base.py	2006-09-10 22:01:44.000000000 -0300
 @@ -46,6 +46,8 @@
          development or installed project."""
          load_project_config(self.config)
@@ -9,32 +9,23 @@
          if self.dburi and self.dburi.startswith("notrans_"):
              self.dburi = self.dburi[8:]
  
-@@ -291,15 +293,29 @@
+@@ -291,7 +293,7 @@
                  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),
++                conf.get("global").get("sqlobject.dburi", "sqlite:///tmp/devdata.sqlite"),
                  "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),
+                 "identity.on" : conf.get("global").get("identity.on", False)
                  }})
- 
+@@ -299,7 +301,13 @@
          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':
++        # Disable tools which need SQLObject if it is not being used
++        if conf.get('global').get('sqlobject.dburi', None) is None:
 +            for tool in tb.toolbox:
 +                if tool['label'] == 'CatWalk' or tool['label'] == 'ModelDesigner':
 +                    tool['disabled'] = True