Browse Source

deal with getSliceDir returning nothing

Natenom/support-murmur-13-1446181288462
Michael Ziegler 14 years ago
parent
commit
7538c3a35d
  1. 6
      pyweb/mumble/MumbleCtlIce.py

6
pyweb/mumble/MumbleCtlIce.py

@ -37,13 +37,17 @@ def loadSlice( slicefile ):
if hasattr( Ice, "getSliceDir" ): if hasattr( Ice, "getSliceDir" ):
icepath = Ice.getSliceDir() icepath = Ice.getSliceDir()
else: else:
icepath = None
# Ice returns '' in getSliceDir() sometimes. (I kid you not.)
if not icepath:
from django.conf import settings from django.conf import settings
icepath = settings.SLICEDIR icepath = settings.SLICEDIR
if not exists( join( icepath, "Ice", "SliceChecksumDict.ice" ) ): if not exists( join( icepath, "Ice", "SliceChecksumDict.ice" ) ):
icepath = None icepath = None
if not icepath: if not icepath:
# last resort, let's hope to christ this works (won't for >=1.2.3)
# last resort when getSliceDir fails AND settings are wrong, won't work for >=1.2.3
Ice.loadSlice( slicefile ) Ice.loadSlice( slicefile )
else: else:
Ice.loadSlice( '', ['-I' + icepath, slicefile ] ) Ice.loadSlice( '', ['-I' + icepath, slicefile ] )

Loading…
Cancel
Save