From 070d5be14123a2c714752b47ea8d52ac5ae93144 Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Fri, 5 Mar 2010 08:43:21 +0100 Subject: [PATCH] Releasing second beta of v2.0. Looks like v2.0 final will be released on Sunday. :) --- CHANGELOG | 11 +++++++++++ pyweb/mumble/management/__init__.py | 10 +++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0f5bcfc..75cf273 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,17 @@ Mumble-Django changelog ======================= +Version 2.0beta2, 5 Mar 2010: +------------------------------ +* Drop "NOT NULL" constraint on the port column during the database transition. +* Display users' FQDN and IP Adresses to admins. +* Fix updating the user texture. +* Fix the admin to correctly handle Murmur processes that are not currently running. +* Move the database file to the "db" subdirectory, because people tend to set the + permissions with "chown -R user /*" instead of "chown -R user ", + which has been repeatedly causing problems in the past. The database file will + be moved automatically when needed. + Version 2.0beta1, 28 Feb 2010: ------------------------------ * Remove a lot of columns from MDs database and replace them with properties. That diff --git a/pyweb/mumble/management/__init__.py b/pyweb/mumble/management/__init__.py index 59765dc..1a4efc2 100644 --- a/pyweb/mumble/management/__init__.py +++ b/pyweb/mumble/management/__init__.py @@ -21,7 +21,7 @@ from django.conf import settings from django.db import connection from django.db.models import signals -from mumble import models +from mumble.models import Mumble from update_schema import update_schema from server_detect import find_existing_instances @@ -36,15 +36,11 @@ if settings.DATABASE_ENGINE == "sqlite3": cursor = connection.cursor() -tablename = models.Mumble._meta.db_table +tablename = Mumble._meta.db_table -uptodate = False if tablename in connection.introspection.get_table_list(cursor): fields = connection.introspection.get_table_description(cursor, tablename) - for entry in fields: - if entry[0] == "server_id": - uptodate = True - break + uptodate = "server_id" in [ entry[0] for entry in fields ] else: # Table doesn't yet exist, so syncdb will create it properly uptodate = True