summaryrefslogtreecommitdiffstats
path: root/Other_Tools
diff options
context:
space:
mode:
authorApprentice Harper <[email protected]>2017-06-27 17:22:23 +0100
committerApprentice Harper <[email protected]>2017-06-27 17:22:23 +0100
commita252dd0da673f29c9c2a53a0dfd0595f3e944503 (patch)
treea51c11cba0578549c9536d06a90e97793d6ce769 /Other_Tools
parent2042354788bffd0eddedf3e1912fcc26ec5e533a (diff)
Kindlekey fix for complex mac disk setups.
Diffstat (limited to 'Other_Tools')
-rw-r--r--Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw5
1 files changed, 3 insertions, 2 deletions
diff --git a/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw b/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
index 376dbf5..20979c8 100644
--- a/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
+++ b/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
@@ -23,6 +23,7 @@ from __future__ import with_statement
# 2.2 - Fixes for Macs with bonded ethernet ports
# Also removed old .kinfo file support (pre-2011)
# 2.3 - Added more field names thanks to concavegit's KFX code.
+# 2.4 - Fix for complex Mac disk setups, thanks to Tibs
"""
@@ -30,7 +31,7 @@ Retrieve Kindle for PC/Mac user key.
"""
__license__ = 'GPL v3'
-__version__ = '2.3'
+__version__ = '2.4'
import sys, os, re
from struct import pack, unpack, unpack_from
@@ -1267,7 +1268,7 @@ elif isosx:
for j in xrange(cnt):
resline = reslst[j]
if resline.startswith('/dev'):
- (devpart, mpath) = resline.split(' on ')
+ (devpart, mpath) = resline.split(' on ')[:2]
dpart = devpart[5:]
names.append(dpart)
return names