From e7e25762c4ed1256f8fef2aae2a558134f48ad46 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 10 May 2011 10:43:51 -0700 Subject: Trim "/dev/" correctly in list-harddrives (#702430). Trim the leading /dev/ from device node names in the list-harddrives command-stub. --- data/command-stubs/list-harddrives-stub | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/command-stubs/list-harddrives-stub b/data/command-stubs/list-harddrives-stub index 40251865b..75e8f8906 100755 --- a/data/command-stubs/list-harddrives-stub +++ b/data/command-stubs/list-harddrives-stub @@ -27,7 +27,12 @@ def main(argv): lst = set() for dev in filter(lambda d: d.type != parted.DEVICE_DM, parted.getAllDevices()): - lst.add((os.path.basename(dev.path), dev.getSize())) + if dev.path.startswith("/dev/"): + path = dev.path[5:] + else: + path = dev.path + + lst.add((path, dev.getSize())) lst = list(lst) lst.sort() -- cgit