Chris Lumens <clumens@xxxxxxxxxx> wrote:
> > diff --git a/command-stubs/list-harddrives-stub b/command-stubs/list-harddrives-stub
> > index 25d9eb0..ee9efa8 100755
> > --- a/command-stubs/list-harddrives-stub
> > +++ b/command-stubs/list-harddrives-stub
> > @@ -27,8 +27,7 @@ def main(argv):
> > lst = set()
> >
> > for dev in filter(lambda d: d.type != parted.DEVICE_DM, parted.getAllDevices()):
> > - path = dev.path.lstrip("/dev/")
> > - lst.add((path, dev.getSize()))
> > + lst.add((dev.path[5:], dev.getSize()))
> >
> > lst = list(lst)
> > lst.sort()
>
> Given history here, I feel like we should be overly paranoid and do a:
>
> if dev.path.startswith("/dev/"):
>
> Though it shouldn't really make any difference.
I thought about doing that, but then went for minimal. But I like the
idea of being overly paranoid at this point. How about this revision:
diff --git a/command-stubs/list-harddrives-stub b/command-stubs/list-harddrives-stub
index ee9efa8..75e8f89 100755
--- a/command-stubs/list-harddrives-stub
+++ b/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((dev.path[5:], 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()
--
David Cantrell <dcantrell@xxxxxxxxxx>
Supervisor, Installer Engineering Team
Red Hat, Inc. | Seattle, WA | PST5PDT
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
