summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Thomas <james.thomas@codethink.co.uk>2016-01-12 16:07:44 +0000
committerBaserock Gerrit <gerrit@baserock.org>2016-02-25 17:41:29 +0000
commit4e8e32e58a38b1497b59de25ab7bc7273f2e8e04 (patch)
tree3679b7f4fc4eebd5d9672a1a12512d68c22e0271
parent9c7ab5f5744eb709443a577d1a21eebb5c6a941e (diff)
downloaddefinitions-4e8e32e58a38b1497b59de25ab7bc7273f2e8e04.tar.gz
Fix get_partition_by_mountpoint to actually return non '/' mount points
Change-Id: Ia11f37eef9aa927414f8b487eba3a276cc91b2aa
-rw-r--r--extensions/pyfdisk.py9
1 files 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"""