Fixed some python errors; added a message to clue someone in to an out of date version of makemkv.

This commit is contained in:
ac3d912 2014-06-27 14:47:38 -04:00
parent 7f923f8ce0
commit 8bd206f475

View file

@ -82,8 +82,8 @@ class MakeMkvInteraction:
except IOError: except IOError:
pass pass
if proc.poll() : if proc.poll() :
if proc.proc != 0 : if proc.returncode != 0 :
self.message(_(50070)) self.log.error("makemkvcon error'd out! May require update. (Return Code: %s)" % proc.returncode)
return -1 return -1
xbmc.sleep(1000) xbmc.sleep(1000)
timeSlept = timeSlept + 1 timeSlept = timeSlept + 1
@ -93,6 +93,7 @@ class MakeMkvInteraction:
def killMkv(self): def killMkv(self):
# Linux # Linux
if os.name == 'posix':
try : try :
self.log.info('attempting linux kill of makemkvcon') self.log.info('attempting linux kill of makemkvcon')
subprocess.call('killall -9 makemkvcon', shell=True) subprocess.call('killall -9 makemkvcon', shell=True)
@ -101,6 +102,7 @@ class MakeMkvInteraction:
pass pass
#Windows. #Windows.
if os.name == 'nt':
try : try :
self.log.info('attempting windows kill of makemkvcon') self.log.info('attempting windows kill of makemkvcon')
subprocess.call('taskkill /F /IM makemkvcon.exe', shell=True) subprocess.call('taskkill /F /IM makemkvcon.exe', shell=True)