Added check to ensure disk exists in both volumes and mounts

ARMmbed · Sep 21, 2015 · 6ed2114 · 6ed2114
1 parent eac21bb
commit 6ed2114
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/mbed_lstools/lstools_darwin.py b/mbed_lstools/lstools_darwin.py
@@ -35,11 +35,18 @@ def list_mbeds(self):
 
         # {volume_id: {serial:, vendor_id:, product_id:, tty:}}
         volumes = self.get_mbed_volumes()
-        #print 'volumes:', volumes
 
         # {volume_id: mount_point}
         mounts = self.get_mount_points()
-        #print "mounts:", mounts
+
+        volumes_keys = set(volumes.keys())
+        mounts_keys = set(mounts.keys())
+        intersection = volumes_keys & mounts_keys
+
+        valid_volumes = {}
+
+        for key in intersection:
+            valid_volumes[key] = volumes[key]
 
         # put together all of that info into the expected format:
         result =  [
@@ -48,7 +55,7 @@ def list_mbeds(self):
                 'serial_port': volumes[v]['tty'],
                   'target_id': self.target_id(volumes[v]),
               'platform_name': self.platform_name(self.target_id(volumes[v]))
-            } for v in volumes
+            } for v in valid_volumes
         ]
 
         self.ERRORLEVEL_FLAG = 0