From 49244072c4fcd9004e8d389c377d999161816287 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 31 Aug 2017 20:56:25 +0300 Subject: [PATCH] Improve fetching of logical disks --- platformio/util.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/platformio/util.py b/platformio/util.py index 03f6f134..969a3a7c 100644 --- a/platformio/util.py +++ b/platformio/util.py @@ -458,14 +458,17 @@ def get_logicaldisks(): match = disknamere.match(line.strip()) if not match: continue - disks.append({"disk": match.group(1), "name": match.group(2)}) + disks.append({ + "disk": match.group(1) + "\\", + "name": match.group(2) + }) return disks except WindowsError: # pylint: disable=undefined-variable pass # try "fsutil" result = exec_command(["fsutil", "fsinfo", "drives"]).get("out", "") for disk in re.findall(r"[A-Z]:\\", result): - disks.append({"disk": disk[:-1], "name": disk}) + disks.append({"disk": disk, "name": None}) return disks else: result = exec_command(["df"]).get("out")