[Python-modules-commits] r1532 - in /packages/forgetsql/trunk: bin/forgetsql-generate debian/changelog

[werner at users.alioth.debian.org]

Author: werner
Date: Thu Nov 23 01:09:19 2006
New Revision: 1532

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1532
Log:
fixing remaining bugs

Modified:
    packages/forgetsql/trunk/bin/forgetsql-generate
    packages/forgetsql/trunk/debian/changelog

Modified: packages/forgetsql/trunk/bin/forgetsql-generate
URL: http://svn.debian.org/wsvn/python-modules/packages/forgetsql/trunk/bin/forgetsql-generate?rev=1532&op=diff
==============================================================================
--- packages/forgetsql/trunk/bin/forgetsql-generate (original)
+++ packages/forgetsql/trunk/bin/forgetsql-generate Thu Nov 23 01:09:19 2006
@@ -193,7 +193,7 @@
     if options.output:
         try:
             # Override print.. dirty. 
-            sys.stdout = open(output, "w")
+            sys.stdout = open(options.output, "w")
         except IOError, e:
             print >>sys.stderr, "%s: %s" % (e.strerror, e.filename)
             sys.exit(3)
@@ -220,7 +220,10 @@
     else:
         params = {}
         if options.database:
-            params['database'] = options.database
+            if options.dbmodule == "MySQLdb":
+                params['db'] = options.database
+            else:
+                params['database'] = options.database
         else:
             print >>sys.stderr, "Missing required option --database or --connect"     
             sys.exit(7)
@@ -229,7 +232,11 @@
         if options.username:
             params['user'] = options.username    
         if options.password:
-            params['password'] = options.password    
+            if options.dbmodule == "MySQLdb":
+                params['passwd'] = options.password
+            else:
+                params['password'] = options.password
+        
         connectstring = ", ".join(["%s=%r" % (key, value)
                                   for (key,value) in params.items()
                            # filter out password for 'security reasons'

Modified: packages/forgetsql/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/forgetsql/trunk/debian/changelog?rev=1532&op=diff
==============================================================================
--- packages/forgetsql/trunk/debian/changelog (original)
+++ packages/forgetsql/trunk/debian/changelog Thu Nov 23 01:09:19 2006
@@ -1,10 +1,15 @@
-forgetsql (0.5.1-8) UNRELEASED; urgency=low
+forgetsql (0.5.1-8) unstable; urgency=medium
 
   * Only provides ${python:Provides} as we only want to provide packages
     for supported python versions. (Closes: #399933)
   * Bumped Standards-Version (no changes needed).
+  * Fixing typo for option handling in forgetsql-generate. (Closes: #324917)
+  * Accepting patch to make forgetsql-generate work with the MySQLdb module.
+    (Closes: #324919)
+  * Setting urgency to medium as I want these small silly bugs to be fixed
+    also in etch.
 
- -- Morten Werner Olsen <werner at debian.org>  Thu, 23 Nov 2006 00:45:52 +0100
+ -- Morten Werner Olsen <werner at debian.org>  Thu, 23 Nov 2006 01:08:10 +0100
 
 forgetsql (0.5.1-7) unstable; urgency=low