From 4e8e32e58a38b1497b59de25ab7bc7273f2e8e04 Mon Sep 17 00:00:00 2001 From: James Thomas Date: Tue, 12 Jan 2016 16:07:44 +0000 Subject: Fix get_partition_by_mountpoint to actually return non '/' mount points Change-Id: Ia11f37eef9aa927414f8b487eba3a276cc91b2aa --- extensions/pyfdisk.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/extensions/pyfdisk.py b/extensions/pyfdisk.py index 265dc64e..a7796729 100644 --- a/extensions/pyfdisk.py +++ b/extensions/pyfdisk.py @@ -464,9 +464,12 @@ class Device(object): def get_partition_by_mountpoint(self, mountpoint): """Return a Partition with a specified mountpoint""" - return next(r for r in self.partitionlist - if hasattr(r, 'mountpoint') - and r.mountpoint == '/') + try: + return next(r for r in self.partitionlist + if hasattr(r, 'mountpoint') + and r.mountpoint == mountpoint) + except StopIteration: + return False def commit(self): """Write the partition table to the disk or image""" -- cgit v1.2.1