[Python-modules-commits] r1313 - in /packages/turbogears/trunk/debian: changelog patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff

[kov at users.alioth.debian.org]

Author: kov
Date: Sun Aug 27 00:10:46 2006
New Revision: 1313

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1313
Log:
allow sqlachemy to be the default ORM if SQLObject is not at
the required version or is not there

Added:
    packages/turbogears/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.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=1313&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/changelog (original)
+++ packages/turbogears/trunk/debian/changelog Sun Aug 27 00:10:46 2006
@@ -11,11 +11,15 @@
   * debian/control:
   - added python-sqlalchemy as alternative to the development version of
     SQLObject (Closes: #384415)
+  * debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff:
+  - allow sqlalchemy to be the default ORM if the required SQLObject version
+    is not available; this may be allow me to upload TG to unstable this week
+    if no critical problems arise
 
   [ Piotr Ozarowski ]
   * Added SQLAlchemy to long description
 
- -- Gustavo Noronha Silva <kov at debian.org>  Sat, 26 Aug 2006 18:27:58 -0300
+ -- Gustavo Noronha Silva <kov at debian.org>  Sat, 26 Aug 2006 21:10:11 -0300
 
 turbogears (0.9a8-3) experimental; urgency=low
 

Added: packages/turbogears/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff?rev=1313&op=file
==============================================================================
--- packages/turbogears/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff (added)
+++ packages/turbogears/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff Sun Aug 27 00:10:46 2006
@@ -1,0 +1,21 @@
+--- turbogears/command/quickstart.py~	2006-08-17 18:55:57.000000000 -0300
++++ turbogears/command/quickstart.py	2006-08-26 20:58:13.000000000 -0300
+@@ -112,9 +112,17 @@
+         parser.add_option("-t", "--templates", 
+             help="user specific templates",
+             dest="templates", default = self.templates)
++        # Debian hack to make sqlalchemy the default if the
++        # required version of sqlobject is not available
++        try:
++            pkg_resources.require ('SQLObject>=0.7.1a')
++            debsqlalchemy = False
++        except:
++            debsqlalchemy = True
+         parser.add_option("-s", "--sqlalchemy",
+             help="use SQLAlchemy instead of SQLObject",
+-            action="store_true", dest="sqlalchemy", default = False)
++            action="store_true", dest="sqlalchemy", default = debsqlalchemy)
++        # end of Debian hack
+         parser.add_option("-i", "--identity",
+             help="provide Identity support",
+             action="store_true", dest="identity", default = False)