[Python-modules-commits] r5309 - in packages/turbogears/trunk/debian (2 files)

[kov at users.alioth.debian.org]

    Date: Saturday, May 10, 2008 @ 19:58:42
  Author: kov
Revision: 5309

updated patch for new version

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

Modified: packages/turbogears/trunk/debian/changelog
===================================================================
--- packages/turbogears/trunk/debian/changelog	2008-05-10 19:50:50 UTC (rev 5308)
+++ packages/turbogears/trunk/debian/changelog	2008-05-10 19:58:42 UTC (rev 5309)
@@ -7,8 +7,10 @@
   * debian/control, debian/patches/01_disable_requirements.diff:
   - no longer try to fight the dumb setuptools dependency stuff, we'll
     just play along, providing the build system with all the runtime needs
+  * 03_sqlalchemy_identity_toolbox_fixup.diff:
+  - updated for new version
 
- -- Gustavo Noronha Silva <kov at debian.org>  Sat, 10 May 2008 11:06:09 -0300
+ -- Gustavo Noronha Silva <kov at debian.org>  Sat, 10 May 2008 16:58:12 -0300
 
 turbogears (1.0.4.3-1) unstable; urgency=low
 

Modified: packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff
===================================================================
--- packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff	2008-05-10 19:50:50 UTC (rev 5308)
+++ packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff	2008-05-10 19:58:42 UTC (rev 5309)
@@ -1,17 +1,17 @@
---- turbogears/command/base.py.orig	2007-07-21 17:08:37.000000000 -0300
-+++ turbogears/command/base.py	2007-09-15 13:47:03.000000000 -0300
-@@ -46,6 +46,8 @@
+--- turbogears/command/base.py.orig	2008-03-03 18:30:58.000000000 -0300
++++ turbogears/command/base.py	2008-05-10 11:18:51.000000000 -0300
+@@ -47,6 +47,8 @@
          development or installed project."""
          load_project_config(self.config)
-         self.dburi = turbogears.config.get("sqlobject.dburi", None)
+         self.dburi = config.get("sqlobject.dburi", None)
 +        if not self.dburi:
-+            self.dburi = turbogears.config.get("sqlalchemy.dburi", None)
++            self.dburi = config.get("sqlalchemy.dburi", None)
          if self.dburi and self.dburi.startswith("notrans_"):
              self.dburi = self.dburi[8:]
  
-@@ -299,8 +301,14 @@
+@@ -276,8 +278,14 @@
          if 'global' in conf:
-             turbogears.config.update({'global': conf['global']})
+             config.update({'global': conf['global']})
  
 -        root = SecureObject(toolbox.Toolbox(), from_any_host(self.hostlist),
 -                exclude=['noaccess'])