fix jarfile path encoding for windows, because Popen only accepts encoded strings
This commit is contained in:
parent
e1e0ae6152
commit
04b85ee62e
@ -160,7 +160,7 @@ this way.
|
|||||||
self.versions.append(version)
|
self.versions.append(version)
|
||||||
|
|
||||||
def jarfileForVersion(self, v):
|
def jarfileForVersion(self, v):
|
||||||
return os.path.join(self.cacheDir, v, "minecraft_server.jar")
|
return os.path.join(self.cacheDir, v, "minecraft_server.jar").encode(sys.getfilesystemencoding())
|
||||||
def checksumForVersion(self, v):
|
def checksumForVersion(self, v):
|
||||||
jf = self.jarfileForVersion(v)
|
jf = self.jarfileForVersion(v)
|
||||||
with file(jf, "rb") as f:
|
with file(jf, "rb") as f:
|
||||||
@ -453,7 +453,7 @@ class MCServerChunkGenerator(object):
|
|||||||
lowMemory = False
|
lowMemory = False
|
||||||
@classmethod
|
@classmethod
|
||||||
def _runServer(cls, startingDir, jarfile):
|
def _runServer(cls, startingDir, jarfile):
|
||||||
print u"Starting server {0} in {1}".format(jarfile, startingDir)
|
info("Starting server %s in %s", jarfile, startingDir)
|
||||||
if cls.lowMemory: memflags = []
|
if cls.lowMemory: memflags = []
|
||||||
else: memflags = ["-Xmx1024M", "-Xms1024M", ]
|
else: memflags = ["-Xmx1024M", "-Xms1024M", ]
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user