Kindlekey fix for complex mac disk setups.

tielobraga · Jun 27, 2017 · a252dd0 · a252dd0
1 parent 2042354
commit a252dd0
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kindlekey.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/kindlekey.py
@@ -23,14 +23,15 @@
 #  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
 
 
 """
 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 @@ def GetDiskPartitionNames():
         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

diff --git a/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kindlekey.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kindlekey.py
@@ -23,14 +23,15 @@
 #  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
 
 
 """
 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 @@ def GetDiskPartitionNames():
         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

diff --git a/DeDRM_calibre_plugin/DeDRM_plugin.zip b/DeDRM_calibre_plugin/DeDRM_plugin.zip
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/kindlekey.py b/DeDRM_calibre_plugin/DeDRM_plugin/kindlekey.py
@@ -23,14 +23,15 @@
 #  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
 
 
 """
 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 @@ def GetDiskPartitionNames():
         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

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
@@ -23,14 +23,15 @@ 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
 
 
 """
 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