Merge branch 'master' of git://git.assembla.com/fpdboz.git

Conflicts: pyfpdb/Configuration.py pyfpdb/Database.py
2009-03-11 22:41:43 -04:00
parent 509192d23e c582507b9f
commit 27e0df2a24
19 changed files with 1532 additions and 733 deletions
@@ -149,8 +149,8 @@ class Database:
            cv = "card%dValue" % i
            if cv not in d or d[cv] == None:
                break
-            elif d[cv] == 0:
-                cards = "%sxx" % cards
+            elif d[key] == 0:
+                cards += "xx"
            else:
                cs = "card%dSuit" % i
                cards = "%s%s%s" % (cards, ranks[d[cv]], d[cs])