[Pkg-voip-commits] r7888 - in /mumble-django/trunk/debian: changelog patches/04-registration-bug.diff patches/series

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Tue Dec 15 23:36:08 2009
New Revision: 7888

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7888
Log:
Add patch to fix the bug that prevents the channel viewer from loading when
a player without a valid email address joins the server (see upstream
changeset 09afc1bf3580).

Added:
    mumble-django/trunk/debian/patches/04-registration-bug.diff
Modified:
    mumble-django/trunk/debian/changelog
    mumble-django/trunk/debian/patches/series

Modified: mumble-django/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/changelog?rev=7888&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Tue Dec 15 23:36:08 2009
@@ -1,12 +1,15 @@
-mumble-django (1.0-1) unstable; urgency=low
+mumble-django (1.0-1) unstable; urgency=medium
 
   * New upstream release v1.0.
   * Bump dependency for mumble-server to 1.2.0.
   * Remove hunk that changes the SLICE_VERSION variable in settings.py.
   * Remove chmod for ja/LC_MESSAGES/django.po (fixed upstream).
   * Patch DEFAULT_CONNSTR variable in settings.py to point to Ice.
+  * Add patch to fix the bug that prevents the channel viewer from loading when
+    a player without a valid email address joins the server (see upstream
+    changeset 09afc1bf3580).
 
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Wed, 16 Dec 2009 00:23:08 +0100
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Wed, 16 Dec 2009 00:33:25 +0100
 
 mumble-django (0.12-1) unstable; urgency=low
 

Added: mumble-django/trunk/debian/patches/04-registration-bug.diff
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/04-registration-bug.diff?rev=7888&op=file
==============================================================================
--- mumble-django/trunk/debian/patches/04-registration-bug.diff (added)
+++ mumble-django/trunk/debian/patches/04-registration-bug.diff Tue Dec 15 23:36:08 2009
@@ -1,0 +1,20 @@
+Index: mumble-django-1.0/pyweb/mumble/MumbleCtlIce.py
+===================================================================
+--- mumble-django-1.0.orig/pyweb/mumble/MumbleCtlIce.py	2009-12-16 00:31:30.000000000 +0100
++++ mumble-django-1.0/pyweb/mumble/MumbleCtlIce.py	2009-12-16 00:31:36.000000000 +0100
+@@ -316,10 +316,11 @@
+ 	def getRegistration(self, srvid, mumbleid):
+ 		from Murmur import UserInfo
+ 		reg = self._getIceServerObject( srvid ).getRegistration( mumbleid )
+-		user = {
+-			'name':  reg[UserInfo.UserName],
+-			'email': reg[UserInfo.UserEmail],
+-			};
++		user = {};
++		if UserInfo.UserName in reg:
++			user['name'] = reg[UserInfo.UserName];
++		if UserInfo.UserEmail in reg:
++			user['email'] = reg[UserInfo.UserEmail];
+ 		if UserInfo.UserComment in reg:
+ 			user['comment'] = reg[UserInfo.UserComment];
+ 		if UserInfo.UserHash in reg:

Modified: mumble-django/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/series?rev=7888&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/series (original)
+++ mumble-django/trunk/debian/patches/series Tue Dec 15 23:36:08 2009
@@ -1,3 +1,4 @@
+04-registration-bug.diff
 01-settings.diff
 02-munin.diff
 03-genkey-follow-symlink.diff