From 3745a2d1ac1d80120057e6b2dcbc8def90ac1b0d Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Fri, 8 Jan 2010 14:28:53 +0100 Subject: [PATCH] fix version autodetection to work with 1.2.1 --- pyweb/mumble/MumbleCtlIce.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyweb/mumble/MumbleCtlIce.py b/pyweb/mumble/MumbleCtlIce.py index b92e1c1..189df66 100644 --- a/pyweb/mumble/MumbleCtlIce.py +++ b/pyweb/mumble/MumbleCtlIce.py @@ -58,6 +58,7 @@ def MumbleCtlIce( connstring ): ( settings.SLICE_VERSION, settings.SLICE ), ( ( 1, 1, 8 ), None ), ( ( 1, 2, 0 ), None ), + ( ( 1, 2, 1 ), None ), ); for version, slice in candidates: @@ -85,7 +86,7 @@ def MumbleCtlIce( connstring ): elif murmurversion[0] == murmurversion[1] == 1 and murmurversion[2] <= 8: return MumbleCtlIce_118( connstring, meta ); - elif murmurversion[0] == 1 and murmurversion[1] == 2 and murmurversion[2] == 0: + elif murmurversion[0] == 1 and murmurversion[1] == 2: return MumbleCtlIce_120( connstring, meta ); raise EnvironmentError( "Could not find a Slice matching your version of Murmur." );